bzr commit into mysql-6.0-rpl branch (zhenxing.he:2743) Bug#40129 Bug#40142 Bug#40636 Bug#41108 Bug#41186

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b40115/6.0-rpl-new/

 2743 He Zhenxing	2008-12-15 [merge]
      Auto merge
modified:
  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
  mysql-test/include/wait_for_slave_sql_error.inc
  mysql-test/include/wait_until_disconnected.inc
  mysql-test/lib/mtr_cases.pm
  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
  mysql-test/t/disabled.def

=== 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/include/wait_until_disconnected.inc'
--- a/mysql-test/include/wait_until_disconnected.inc	2008-04-20 18:24:00 +0000
+++ b/mysql-test/include/wait_until_disconnected.inc	2008-12-10 18:40:27 +0000
@@ -4,7 +4,7 @@
 --disable_result_log
 --disable_query_log
 let $counter= 500;
-let $mysql_errno= 9999;
+let $mysql_errno= 0;
 while (!$mysql_errno)
 {
   --error 0,1053,2002,2006

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2008-11-14 20:47:02 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2008-12-12 21:55:14 +0000
@@ -618,7 +618,6 @@ sub optimize_cases {
 sub process_opts_file {
   my ($tinfo, $opt_file, $opt_name)= @_;
 
-  $tinfo->{$opt_name}= [];
   if ( -f $opt_file )
   {
     my $opts= opts_from_file($opt_file);
@@ -795,17 +794,6 @@ sub collect_one_test_case {
   push(@{$tinfo->{'master_opt'}}, @$suite_opts);
   push(@{$tinfo->{'slave_opt'}}, @$suite_opts);
 
-  # ----------------------------------------------------------------------
-  # Add master opts, extra options only for master
-  # ----------------------------------------------------------------------
-  process_opts_file($tinfo, "$testdir/$tname-master.opt", 'master_opt');
-
-  # ----------------------------------------------------------------------
-  # Add slave opts, list of extra option only for slave
-  # ----------------------------------------------------------------------
-  process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
-  
-  
   #-----------------------------------------------------------------------
   # Check for test specific config file
   #-----------------------------------------------------------------------
@@ -1026,6 +1014,16 @@ sub collect_one_test_case {
   push(@{$tinfo->{'master_opt'}}, @::opt_extra_mysqld_opt);
   push(@{$tinfo->{'slave_opt'}}, @::opt_extra_mysqld_opt);
 
+  # ----------------------------------------------------------------------
+  # Add master opts, extra options only for master
+  # ----------------------------------------------------------------------
+  process_opts_file($tinfo, "$testdir/$tname-master.opt", 'master_opt');
+
+  # ----------------------------------------------------------------------
+  # Add slave opts, list of extra option only for slave
+  # ----------------------------------------------------------------------
+  process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
+
   return $tinfo;
 }
 

=== 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;

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-12-06 00:24:23 +0000
+++ b/mysql-test/t/disabled.def	2008-12-12 21:55:14 +0000
@@ -35,3 +35,4 @@ thread_cache_size_func      : Bug#40574 
 innodb_max_dirty_pages_pct_func       : BUG#41018 BUG#39382 2008-12-02 sven test fails
often. some failures fill up the disk, causing subsequent failures in many other tests
 log_output_basic     : Bug #40988       log_output_basic.test succeeded though
syntactically false.
 innodb               : Bug #41056    Innodb.test shows some difference to its result
file.
+log_bin_trust_function_creators_func : Bug#41003 Dec-12-2008 andrei todo:re-enable after
merging the bug fixes from the main trees.