Alexey Kopytov 598cf5aec7 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ... Conflicts: conflict Makefile.am conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test conflict sql/opt_sum.cc conflict sql/set_var.cc conflict sql/sql_base.cc conflict sql/sql_priv.h conflict sql/sql_show.cc		2010-05-24 00:41:18 +04:00
..
r	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04: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	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
combinations	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00