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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-06-06 17:51:28 +02:00
parent 1ff1cb10fc 33ef993773
commit 4749d40c63
464 changed files with 7741 additions and 3075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/rpl/r/rpl_stm_until.result
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 ====
@@ -34,7 +35,7 @@ n
3
4
include/check_slave_param.inc [Exec_Master_Log_Pos]
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=RELAY_LOG_POS;
start slave until relay_log_file='slave-relay-bin.000003', relay_log_pos=RELAY_LOG_POS;
include/wait_for_slave_io_to_start.inc
include/wait_for_slave_sql_to_stop.inc
select * from t2;
@@ -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