database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge maint1.mysql.com:/data/localhome/tsmith/bk/50

Browse Source 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
This commit is contained in:
unknown
2007-06-18 22:11:49 +02:00
parent 4831826c69 c18b568983
commit 34a55d77e4
5 changed files with 112 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/t/rpl_log_pos.test
View File

@ -4,31 +4,29 @@
source include/master-slave.inc;
show master status;
sync_slave_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
stop slave;
change master to master_log_pos=73;
start slave;
sleep 5;
stop slave;
--source include/wait_for_slave_to_stop.inc
change master to master_log_pos=73;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
query_vertical show slave status;
start slave;
sleep 5;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
let $slave_param= Slave_SQL_Running;
let $slave_param_value= Yes;
--source include/wait_for_slave_param.inc
let $slave_param= Slave_IO_Running;
let $slave_param_value= No;
--source include/wait_for_slave_param.inc
stop slave;
change master to master_log_pos=173;
start slave;
sleep 2;
--source include/wait_for_slave_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
query_vertical show slave status;
connection master;
show master status;
create table if not exists t1 (n int);
@ -37,7 +35,6 @@ create table t1 (n int);
insert into t1 values (1),(2),(3);
save_master_pos;
connection slave;
stop slave;
change master to master_log_pos=98;
start slave;
sync_with_master;
@ -46,4 +43,4 @@ connection master;
drop table t1;
sync_slave_with_master;
# End of 4.1 tests
--echo End of 5.0 tests

3
mysql-test/t/rpl_ssl.test
View File

@ -56,6 +56,9 @@ enable_query_log;
connection master;
insert into t1 values (NULL);
sync_slave_with_master;
--source include/wait_for_slave_to_start.inc
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
query_vertical show slave status;
--echo End of 5.0 tests