Alexander Nozdrin 1a0f34e6a4 Manual merge from mysql-next-mr. ... Conflicts: - sql/sys_vars.cc		2010-02-05 15:05:37 +03:00
..
charsets	merged 5.0-bugteam to 5.1-bugteam	2008-05-28 17:18:24 +03:00
errmsg-cnv.sh	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
errmsg-utf8.txt	Manual merge from mysql-next-mr.	2010-02-05 15:05:37 +03:00
errmsg.txt	Manual merge from mysql-next-mr.	2010-02-05 15:05:37 +03:00
Makefile.am	fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE from parsing the MySQL tree.	2010-01-06 11:27:35 +01:00