1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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
372 changed files with 15369 additions and 2607 deletions

View File

@@ -5,6 +5,11 @@
###################################
-- 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 PS as the log positions differs
--disable_ps_protocol