Alexander Nozdrin 1913b715bc Manual merge from mysql-trunk-merge. ... Conflicts: - sql/share/Makefile.am		2010-03-01 12:39:44 +03:00
..
charsets	merged 5.0-bugteam to 5.1-bugteam	2008-05-28 17:18:24 +03:00
CMakeLists.txt	Some CMake packaging fixes:	2010-02-24 19:19:24 +00:00
errmsg-utf8.txt	Manual merge from mysql-trunk.	2010-02-23 17:06:06 +03:00
Makefile.am	Manual merge from mysql-trunk-merge.	2010-03-01 12:39:44 +03:00