diff options
author | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
---|---|---|
committer | unknown <Li-Bing.Song@sun.com> | 2010-05-26 22:34:25 +0800 |
commit | 71e534542bfb6b2cc40909a8bb975fc7564998d0 (patch) | |
tree | 20ebc2f49e17beacbc4a6ebcaa6727f8eb8e765d /mysql-test/suite/rpl/t/rpl_change_master.test | |
parent | 42d91c688c27f9b2496ec6e82535b69ec5d69697 (diff) | |
parent | 8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff) | |
download | mariadb-git-71e534542bfb6b2cc40909a8bb975fc7564998d0.tar.gz |
Manual merge
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_change_master.test')
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_change_master.test | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_change_master.test b/mysql-test/suite/rpl/t/rpl_change_master.test index 997cca42e82..514d6cf8c0f 100644 --- a/mysql-test/suite/rpl/t/rpl_change_master.test +++ b/mysql-test/suite/rpl/t/rpl_change_master.test @@ -19,10 +19,26 @@ let $slave_param= Read_Master_Log_Pos; let $slave_param_value= query_get_value(SHOW MASTER STATUS, Position, 1); connection slave; source include/wait_for_slave_param.inc; -stop slave; -source include/show_slave_status2.inc; +source include/stop_slave.inc; + +let $read_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1); +let $exec_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1); +if (`SELECT $read_pos = $exec_pos`) +{ + source include/show_rpl_debug_info.inc; + echo 'Read_Master_Log_Pos: $read_pos' == 'Exec_Master_Log_Pos: $exec_pos'; + die Failed because Read_Master_Log_Pos is equal to Exec_Master_Log_Pos; +} change master to master_user='root'; -source include/show_slave_status2.inc; +let $read_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1); +let $exec_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1); +if (`SELECT $read_pos <> $exec_pos`) +{ + source include/show_rpl_debug_info.inc; + echo 'Read_Master_Log_Pos: $read_pos' <> 'Exec_Master_Log_Pos: $exec_pos'; + die Failed because Read_Master_Log_Pos is not equal to Exec_Master_Log_Pos; +} + start slave; sync_with_master; select * from t1; |