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

Conflicts:
	ALI-062323W.pid
	ib_logfile0
	ibdata1
	mysql-bin.000009
	mysql-bin.index