Alexander Nozdrin 4f9a1f49c8 Manual merge from mysql-trunk. ... Conflicts: - mysql-test/suite/ndb/r/ndb_dd_ddl.result		2010-02-09 13:14:29 +03:00
..
r	Manual merge from mysql-trunk.	2010-02-09 13:14:29 +03:00
t	Manual merge from mysql-trunk.	2010-02-09 13:14:29 +03:00
my.cnf	WL#1349 Use operating system localization to send it as a default client character set	2009-10-21 17:59:47 +05:00