database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Applied the fix for bug #46931 from mysql-5.1 main trunk

Browse Source 
to fix a failure in rpl_get_master_version_and_clock.test
This commit is contained in:
Igor Babaev
2009-09-18 12:02:57 -07:00
parent f974f10cf1
commit c78dad1556
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
View File

@@ -41,7 +41,17 @@ eval SELECT RELEASE_LOCK($debug_lock);
connection slave; connection slave;
source include/wait_for_slave_io_error.inc; source include/wait_for_slave_io_error.inc;
let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1); 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 # Write file to make mysql-test-run.pl start up the server again
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect

6
mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
View File

@@ -16,7 +16,8 @@ start slave;
SELECT RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP"); SELECT RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP");
RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP") RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP")
1 1
Slave_IO_Errno= 2013 Check network error happened here
NETWORK ERROR
SELECT IS_FREE_LOCK("debug_lock.before_get_SERVER_ID"); SELECT IS_FREE_LOCK("debug_lock.before_get_SERVER_ID");
IS_FREE_LOCK("debug_lock.before_get_SERVER_ID") IS_FREE_LOCK("debug_lock.before_get_SERVER_ID")
1 1
@@ -29,7 +30,8 @@ start slave;
SELECT RELEASE_LOCK("debug_lock.before_get_SERVER_ID"); SELECT RELEASE_LOCK("debug_lock.before_get_SERVER_ID");
RELEASE_LOCK("debug_lock.before_get_SERVER_ID") RELEASE_LOCK("debug_lock.before_get_SERVER_ID")
1 1
Slave_IO_Errno= 2013 Check network error happened here
NETWORK ERROR
set global debug= ''; set global debug= '';
reset master; reset master;
include/stop_slave.inc include/stop_slave.inc