From: Date: December 12 2008 2:07pm
Subject: bzr commit into mysql-6.0-rpl branch (skozlov:2751) Bug#40142 Bug#41108
 Bug#41186
List-Archive: http://lists.mysql.com/commits/61480
X-Bug: 40142,41108,41186
Message-Id: <200812121307.mBCD7QSa006237@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/ksm/sun/repo/bugs-40142-41108-41186/mysql-6.0-rpl/ based on revid:msvensson@stripped

 2751 Serge Kozlov	2008-12-12 [merge]
      Merge. Bug#40142, Bug#41108, Bug#41186 
modified:
  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
  mysql-test/include/wait_for_slave_sql_error.inc
  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
  mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
  mysql-test/suite/rpl/t/rpl_start_stop_slave.test
  mysql-test/suite/rpl/t/rpl_stm_mystery22.test

=== modified file 'mysql-test/extra/rpl_tests/rpl_flsh_tbls.test'
--- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2007-08-08 15:56:15 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2008-12-12 13:06:40 +0000
@@ -4,8 +4,7 @@
 # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
 #
 
-
--- source include/master-slave.inc
+source include/master-slave.inc;
 
 let $SERVER_VERSION=`select version()`;
 
@@ -34,26 +33,32 @@ flush tables;
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/
 eval SHOW BINLOG EVENTS FROM $rename_event_pos ;
-save_master_pos;
-connection slave;
-sync_with_master;
+
+sync_slave_with_master;
 # Check that the slave is not confused.
 select * from t3;
 # Note that all this confusion may cause warnings 'table xx is open on rename'
 # in the .err files; these are not fatal and are not reported by mysql-test-run.
-
 stop slave;
+source include/wait_for_slave_to_stop.inc;
+
 connection master;
 drop table t1;
+
 connection slave;
 flush tables with read lock;
 start slave;
-sleep 1;
+source include/wait_for_slave_to_start.inc;
 --error 1192
 stop slave;
 
+# Cleanup
+unlock tables;
+
 connection master;
 drop table t3, t4, t5;
 
+sync_slave_with_master;
+
 # End of 4.1 tests
 

=== modified file 'mysql-test/include/wait_for_slave_sql_error.inc'
--- a/mysql-test/include/wait_for_slave_sql_error.inc	2008-07-10 16:09:39 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error.inc	2008-12-12 11:40:22 +0000
@@ -7,15 +7,29 @@
 #
 # source include/wait_for_slave_sql_error.inc;
 #
-# Parameters to this macro are $slave_timeout and
-# $slave_keep_connection. See wait_for_slave_param.inc for
-# descriptions.
+# Parameters:
+#
+# $slave_sql_errno
+#   Number of expected SQL error. If it skipped then any error
+#   will pass.
+# 
+# $slave_timeout and
+#   See wait_for_slave_param.inc for descriptions.
+# 
+# $slave_keep_connection. 
+#   See wait_for_slave_param.inc for descriptions.
 
 let $old_slave_param_comparison= $slave_param_comparison;
 
 let $slave_param= Last_SQL_Errno;
 let $slave_param_comparison= !=;
 let $slave_param_value= 0;
+
+if ($slave_sql_errno) {
+  let $slave_param_comparison= =;
+  let $slave_param_value= $slave_sql_errno;
+}
+
 let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
 source include/wait_for_slave_param.inc;
 let $slave_error_message= ;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2008-07-22 14:16:22 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2008-12-12 13:06:40 +0000
@@ -30,4 +30,5 @@ flush tables with read lock;
 start slave;
 stop slave;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+unlock tables;
 drop table t3, t4, t5;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2008-05-29 15:44:11 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2008-12-12 13:06:40 +0000
@@ -30,4 +30,5 @@ flush tables with read lock;
 start slave;
 stop slave;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+unlock tables;
 drop table t3, t4, t5;

=== modified file 'mysql-test/suite/rpl/t/rpl_start_stop_slave.test'
--- a/mysql-test/suite/rpl/t/rpl_start_stop_slave.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test	2008-12-12 13:06:40 +0000
@@ -26,6 +26,7 @@ let $wait_condition= SELECT COUNT(*) > 0
 source include/wait_condition.inc;
 stop slave io_thread;
 start slave io_thread;
+source include/wait_for_slave_to_start.inc;
 sync_with_master;
 
 connection master;

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mystery22.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mystery22.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mystery22.test	2008-12-12 13:06:40 +0000
@@ -28,6 +28,7 @@ insert into t1 values(NULL,'new');
 save_master_pos;
 connection slave;
 # wait until the slave tries to run the query, fails and aborts slave thread
+let $slave_sql_errno= 1062;
 source include/wait_for_slave_sql_error.inc;
 select * from t1 order by n;
 delete from t1 where n = 2;