bzr push into mysql-6.0-rpl branch (aelkin:2751 to 2752)

[Andrei Elkin]

 2752 Andrei Elkin	2008-12-12 [merge]
      merge 5.1-rpl -> 6.0-rpl for bug40129
modified:
  mysql-test/lib/mtr_cases.pm
  mysql-test/t/disabled.def

 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/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/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.