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

mysql-5.5.31 merge

This commit is contained in:
Sergei Golubchik
2013-05-07 13:05:09 +02:00
264 changed files with 3748 additions and 1718 deletions

View File

@@ -1,6 +1,7 @@
include/master-slave.inc
[connection master]
include/rpl_reset.inc
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
[on slave]
include/stop_slave.inc
==== Create some events on master ====
@@ -94,18 +95,4 @@ one
1
drop table t1;
start slave;
include/rpl_reset.inc
flush logs;
drop table if exists t1;
stop slave;
flush logs;
flush logs;
reset slave;
start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS; /* to stop right before DROP */;
include/wait_for_slave_sql_to_stop.inc
show tables /* t1 must exist */;
Tables_in_test
t1
drop table t1;
stop slave;
include/rpl_end.inc