Manual merge 5.1-rep+2 to 5.1-rep+3

This commit is contained in:
He Zhenxing 2009-10-18 11:57:38 +08:00
commit 9630512875
372 changed files with 15368 additions and 2606 deletions

View file

@ -5,6 +5,10 @@
--source include/have_binlog_format_mixed_or_statement.inc
--source include/master-slave.inc
disable_query_log;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
enable_query_log;
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;