Alexey Kopytov 84766b060a Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. ... Conflicts: Text conflict in scripts/Makefile.am Text conflict in sql/share/Makefile.am		2010-02-26 16:06:31 +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-trunk.	2010-02-23 17:06:06 +03:00
errmsg.txt	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-22 00:33:11 +03:00
Makefile.am	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-26 16:06:31 +03:00