mysql
Merge branch 'master' of github.com:chunterg/mysql

Conflicts:
	ALI-062323W.pid
	g/settings.frm
	ib_logfile0
	ib_logfile1
	ibdata1
	mysql-bin.000007
	mysql-bin.000008
	mysql-bin.000009
	mysql-bin.000010
	mysql-bin.000011
	mysql-bin.000012
	mysql-bin.000013
	mysql-bin.000014
	mysql-bin.000015
	mysql-bin.000016
	mysql-bin.000017
	mysql-bin.000018
	mysql-bin.000019
	mysql-bin.000020
	mysql-bin.index
	vb/searchcore.MYD
	vb/searchcore.MYI
	vb/searchcore_text.MYD
	vb/searchcore_text.MYI
	vb/searchgroup.MYD
	vb/searchgroup.MYI
	vb/searchgroup_text.MYD
	vb/searchgroup_text.MYI