maria-developers team mailing list archive

[Igor Babaev <igor@xxxxxxxxxxxx>]

#At lp:maria based on revid:psergey@xxxxxxxxxxxx-20090917230109-mni2vfp5mtgxpbhw

 2749 Igor Babaev	2009-09-18
      Applied the fix for bug #46931 from mysql-5.1 main trunk
      to fix a failure in rpl_get_master_version_and_clock.test
modified:
  mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
  mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result

=== modified file 'mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test'
--- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2009-07-16 06:56:43 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2009-09-18 19:02:57 +0000
@@ -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

=== modified file 'mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2009-07-16 06:56:43 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2009-09-18 19:02:57 +0000
@@ -16,7 +16,8 @@ start slave;
 SELECT RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP");
 RELEASE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP")
 1
-Slave_IO_Errno= 2013
+Check network error happened here
+NETWORK ERROR
 SELECT IS_FREE_LOCK("debug_lock.before_get_SERVER_ID");
 IS_FREE_LOCK("debug_lock.before_get_SERVER_ID")
 1
@@ -29,7 +30,8 @@ start slave;
 SELECT RELEASE_LOCK("debug_lock.before_get_SERVER_ID");
 RELEASE_LOCK("debug_lock.before_get_SERVER_ID")
 1
-Slave_IO_Errno= 2013
+Check network error happened here
+NETWORK ERROR
 set global debug= '';
 reset master;
 include/stop_slave.inc