diff options
| author | <Li-Bing.Song@sun.com> | 2010-05-28 11:21:20 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-05-28 11:21:20 +0800 |
| commit | 8cf9db67d129844ce56329641334d0b23c4329d5 (patch) | |
| tree | b8014c3e0a9f9cec0ccf475e2dcf54a0a7f21034 /mysql-test/extra | |
| parent | fae1efb5f8da08ded0ee55a1da548a89663d04d5 (diff) | |
| parent | 5873b972d90bc1df12708ef066bc25cfed6a5123 (diff) | |
| download | mariadb-git-8cf9db67d129844ce56329641334d0b23c4329d5.tar.gz | |
Manual merge
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. |