List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:April 21 2009 10:26am
Subject:bzr push into mysql-5.1-bugteam branch (svoj:2861 to 2862)
View as plain text  
 2862 Sergey Vojtovich	2009-04-21 [merge]
      Merge 5.0-bugteam to 5.1-bugteam.
      modified:
        mysql-test/r/mysqldump.result
        mysql-test/t/mysqldump.test

 2861 Andrei Elkin	2009-04-21 [merge]
      merge bug#38205 fixes to 5.1-bt
      added:
        mysql-test/suite/bugs/r/rpl_bug38205.result
        mysql-test/suite/bugs/t/rpl_bug38205.test
        mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt
      modified:
        mysql-test/suite/rpl/r/rpl_start_stop_slave.result
        mysql-test/suite/rpl/t/rpl_start_stop_slave.test
        sql/log_event.cc
        sql/slave.cc

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-03-12 15:39:40 +0000
+++ b/mysql-test/r/mysqldump.result	2009-04-21 10:25:04 +0000
@@ -3815,7 +3815,6 @@ DROP TABLE t1,t2;
 
 
 -- Dump completed on DATE
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # Bug #42635: mysqldump includes views that were excluded using 
 #   the --ignore-table option

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-03-12 15:39:40 +0000
+++ b/mysql-test/t/mysqldump.test	2009-04-21 10:25:04 +0000
@@ -1647,9 +1647,6 @@ DROP TABLE t1,t2;
 --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
 --exec $MYSQL_DUMP test
 
-# We reset concurrent_inserts value to whatever it was at the start of the test
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
-
 --echo #
 --echo # Bug #42635: mysqldump includes views that were excluded using 
 --echo #   the --ignore-table option
@@ -1681,7 +1678,6 @@ CREATE TABLE `כדשגכחךלשךדגחכךלדגכ`;
 SET NAMES latin1;
 
-
 --echo #
 --echo # End of 5.0 tests
 --echo #
@@ -1954,6 +1950,7 @@ DROP DATABASE mysqldump_test_db;
 --echo
 
 # We reset concurrent_inserts value to whatever it was at the start of the test
+# This line must be executed _after_ all test cases.
 SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 
 

Thread
bzr push into mysql-5.1-bugteam branch (svoj:2861 to 2862)Sergey Vojtovich21 Apr