Alexey Kopytov 0a5b406fc5 Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. ... Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/sql_acl.cc Text conflict in sql/sql_servers.cc Text conflict in sql/sql_update.cc Text conflict in support-files/mysql.spec.sh		2010-01-15 14:26:53 +03:00
..
r	Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.	2010-01-15 14:26:53 +03:00
t	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2009-10-22 23:30:28 +01: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