diff options
| author | Igor Babaev <igor@askmonty.org> | 2009-09-18 12:02:57 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2009-09-18 12:02:57 -0700 |
| commit | c78dad15569f959106bbff1f102eed6f1c39ed73 (patch) | |
| tree | b3e7ce9f726d54734d4900097a9084a04b68f797 /mysql-test/extra | |
| parent | f974f10cf1e790a162a46d662061fd08b050c648 (diff) | |
| download | mariadb-git-c78dad15569f959106bbff1f102eed6f1c39ed73.tar.gz | |
Applied the fix for bug #46931 from mysql-5.1 main trunk
to fix a failure in rpl_get_master_version_and_clock.test
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test | 12 |
1 files changed, 11 insertions, 1 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 c79ccdd044f..89c136d8893 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 @@ -41,7 +41,17 @@ eval SELECT RELEASE_LOCK($debug_lock); connection slave; source include/wait_for_slave_io_error.inc; let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1); -echo Slave_IO_Errno= $last_io_errno; +--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 +} # Write file to make mysql-test-run.pl start up the server again --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect |