diff options
| author | unknown <mleich@mysql.com> | 2005-12-05 17:57:48 +0100 |
|---|---|---|
| committer | unknown <mleich@mysql.com> | 2005-12-05 17:57:48 +0100 |
| commit | 502412f993931e838e9dcaef5dec6ab2b8974bbf (patch) | |
| tree | 409bdaa0f18a288cb68048e32230608510ff21fc /mysql-test/t | |
| parent | d447f881db2a439049c8ce9e4e80dfd10c83ffa6 (diff) | |
| download | mariadb-git-502412f993931e838e9dcaef5dec6ab2b8974bbf.tar.gz | |
Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs
Solution according to the comments made by Guilhem
- rpl_relayrotate Remove the SHOW SLAVE STATUS It is not needed.
- rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value
mysql-test/r/rpl_deadlock.result:
Updated result
mysql-test/r/rpl_relayrotate.result:
Updated result
mysql-test/r/rpl_until.result:
Updated result
mysql-test/t/disabled.def:
Enabling of the testcases rpl_relayrotate, rpl_until, rpl_deadlock
mysql-test/t/rpl_deadlock.test:
Omit the printing of the "Slave_IO_Running" value
mysql-test/t/rpl_relayrotate.test:
Remove the SHWO STATUS SLAVE command
mysql-test/t/rpl_until.test:
Omit the printing of the "Slave_IO_Running" value
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/disabled.def | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_deadlock.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_relayrotate.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_until.test | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index fe95a543fb5..4f5e11e7fbd 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,7 +11,4 @@ ############################################################################## sp-goto : GOTO is currently is disabled - will be fixed in the future -rpl_relayrotate : Unstable test case, bug#12429 -rpl_until : Unstable test case, bug#12429 -rpl_deadlock : Unstable test case, bug#12429 kill : Unstable test case, bug#9712 diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index d2a8fc0c844..08921caf897 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -102,7 +102,7 @@ commit; sync_with_master; select * from t1; select * from t2; ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 11 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_MYPORT show slave status; diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test index b66cf7a6e0d..e9a4cdd05c5 100644 --- a/mysql-test/t/rpl_relayrotate.test +++ b/mysql-test/t/rpl_relayrotate.test @@ -56,9 +56,6 @@ start slave; # (the only statement with position>=3000 is COMMIT). select master_pos_wait('master-bin.001',3000)>=0; select max(a) from t1; ---replace_column 1 # 8 # 9 # 23 # 33 # ---replace_result $MASTER_MYPORT MASTER_MYPORT -show slave status; connection master; # The following DROP is a very important cleaning task: diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test index 5bc7a040b1b..708f44a1ab6 100644 --- a/mysql-test/t/rpl_until.test +++ b/mysql-test/t/rpl_until.test @@ -49,7 +49,7 @@ sleep 2; wait_for_slave_to_stop; select * from t2; --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 9 # 23 # 33 # +--replace_column 1 # 9 # 11 # 23 # 33 # show slave status; # clean up |