diff options
| author | <Li-Bing.Song@sun.com> | 2010-05-28 10:57:45 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-05-28 10:57:45 +0800 |
| commit | 5873b972d90bc1df12708ef066bc25cfed6a5123 (patch) | |
| tree | 160dc24431167e37c2ede43534e04bcb6ae4d315 /mysql-test/extra | |
| parent | 78c6a8ca30ee47407f034ec76008d200793cca7c (diff) | |
| download | mariadb-git-5873b972d90bc1df12708ef066bc25cfed6a5123.tar.gz | |
Postfix for BUG#49741
Add code to waiting for a set of errors.
Add code to waiting for an error instead of waiting for io thread to stop, as
after 'START SLAVE', the status of io thread is still not running.
But it doesn't mean slave io thread encounters an error.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test index 6e750d57c56..66bd61a8ea9 100644 --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test +++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test @@ -68,19 +68,15 @@ eval SET DEBUG_SYNC=$debug_sync_action; # Show slave last IO errno connection slave; -source include/wait_for_slave_io_to_stop.inc; -let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1); --echo Check network error happened here -if (`SELECT '$last_io_errno' = '2013' || # CR_SERVER_LOST - '$last_io_errno' = '2003' || # CR_CONN_HOST_ERROR - '$last_io_errno' = '2002' || # CR_CONNECTION_ERROR - '$last_io_errno' = '2006' || # CR_SERVER_GONE_ERROR - '$last_io_errno' = '1040' || # ER_CON_COUNT_ERROR - '$last_io_errno' = '1053' # ER_SERVER_SHUTDOWN - `) -{ - --echo NETWORK ERROR -} +# '2013' CR_SERVER_LOST +# '2003' CR_CONN_HOST_ERROR +# '2002' CR_CONNECTION_ERROR +# '2006' CR_SERVER_GONE_ERROR +# '1040' ER_CON_COUNT_ERROR +# '1053' ER_SERVER_SHUTDOWN +let $slave_io_errno= 1040, 1053, 2002, 2003, 2006, 2013; +source include/wait_for_slave_io_error.inc; # deactivate the sync point of get_master_version_and_clock() # now to avoid restarting IO-thread to re-enter it. |