Alfranio Correia 40949a3110 merge mysql-next-mr --> mysql-5.1-rpl-merge ... Conflicts: Text conflict in sql/log.cc Text conflict in sql/slave.cc Text conflict in sql/sql_base.cc		2010-01-13 12:22:34 +00: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	merge mysql-next-mr --> mysql-5.1-rpl-merge	2010-01-13 12:22:34 +00:00
errmsg.txt	Manual merge from next-mr.	2010-01-12 20:07:09 +08: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