Alexander Nozdrin 6c32fa7357 Manual merge from mysql-next-mr. ... Conflicts: - sql/log_event.cc - sql/sql_class.h		2010-02-15 14:16:49 +03:00
..
charsets	merged 5.0-bugteam to 5.1-bugteam	2008-05-28 17:18:24 +03:00
errmsg-utf8.txt	Manual merge from mysql-next-mr.	2010-02-15 14:16:49 +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