summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_deadlock.test
diff options
context:
space:
mode:
authorunknown <mleich@mysql.com>2005-12-05 17:57:48 +0100
committerunknown <mleich@mysql.com>2005-12-05 17:57:48 +0100
commit502412f993931e838e9dcaef5dec6ab2b8974bbf (patch)
tree409bdaa0f18a288cb68048e32230608510ff21fc /mysql-test/t/rpl_deadlock.test
parentd447f881db2a439049c8ce9e4e80dfd10c83ffa6 (diff)
downloadmariadb-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/rpl_deadlock.test')
-rw-r--r--mysql-test/t/rpl_deadlock.test2
1 files changed, 1 insertions, 1 deletions
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;