diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-06-26 12:05:56 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-06-26 12:05:56 +0100 |
| commit | b53715833509ecd21010edf99150154b201e9b23 (patch) | |
| tree | d51b6e0312918ece8c9b78ae62466610695ade64 /mysql-test/extra | |
| parent | 26c4e642efaf9db25f829579b5a4b9dffeaee447 (diff) | |
| download | mariadb-git-b53715833509ecd21010edf99150154b201e9b23.tar.gz | |
BUG#44270: Post-push fix
The test case added failed sporadically on PB. This is due to the
fact that the user thread in some cases is waiting for slave IO
to stop and then check the error number. Thence, sometimes the
user thread would race for the error number with IO thread.
This post push fix addresses this by replacing the wait for slave
io to stop with a wait for slave io error (as it seems it was
added in 6.0 also after patch on which this is based was
pushed). This implied backporting wait_for_slave_io_error.inc
from 6.0 also.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_reset_slave.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_reset_slave.test b/mysql-test/extra/rpl_tests/rpl_reset_slave.test index 49a142f10c2..1f88c792fce 100644 --- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test +++ b/mysql-test/extra/rpl_tests/rpl_reset_slave.test @@ -58,7 +58,7 @@ echo *** errno must be zero: $last_io_errno ***; change master to master_user='impossible_user_name'; start slave; -source include/wait_for_slave_io_to_stop.inc; +source include/wait_for_slave_io_error.inc; let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); --disable_query_log eval SELECT $last_io_errno > 0 as ONE; @@ -79,7 +79,7 @@ let $last_io_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1); source include/stop_slave.inc; change master to master_user='impossible_user_name'; start slave; -source include/wait_for_slave_io_to_stop.inc; +source include/wait_for_slave_io_error.inc; let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); --disable_query_log eval SELECT $last_io_errno > 0 as ONE; |