mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
a85150c364
Manual merge from mysql-5.1 into mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in sql/handler.h Text conflict in storage/archive/ha_archive.cc
32 lines
773 B
Text
32 lines
773 B
Text
include/master-slave.inc
|
|
[connection master]
|
|
create table t1 (n int);
|
|
reset master;
|
|
stop slave;
|
|
include/wait_for_slave_to_stop.inc
|
|
change master to master_port=SLAVE_PORT;
|
|
start slave;
|
|
include/wait_for_slave_to_start.inc
|
|
insert into t1 values (1);
|
|
select * from t1;
|
|
n
|
|
1
|
|
1
|
|
stop slave;
|
|
include/wait_for_slave_to_stop.inc
|
|
drop table t1;
|
|
reset master;
|
|
create table t1(n int);
|
|
create table t2(n int);
|
|
change master to master_port=MASTER_PORT;
|
|
start slave until master_log_file='master-bin.000001', master_log_pos=UNTIL_POS;
|
|
include/wait_for_slave_io_to_start.inc
|
|
include/wait_for_slave_sql_to_stop.inc
|
|
*** checking until position execution: must be only t1 in the list ***
|
|
show tables;
|
|
Tables_in_test
|
|
t1
|
|
start slave sql_thread;
|
|
drop table t1;
|
|
drop table t2;
|
|
include/rpl_end.inc
|