Alexey Kopytov 82ba3e1dbc 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
std_data	Bug#47323 : mysqlbinlog --verbose displays bad output when events contain subset of columns	2009-10-09 16:54:48 +08:00
t	Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.	2010-01-15 14:26:53 +03:00
combinations	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00