MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Patrick Crews Date:September 15 2008 8:42pm
Subject:bzr push into mysql-6.0 branch (patrick.crews:2841 to 2842) Bug#37938
View as plain text  
 2842 Patrick Crews	2008-09-15 [merge]
      Bug#37938 Test "mysqldump" lacks various INSERT statements / values
      Upmerge from 5.1 -> 6.0
modified:
  mysql-test/r/mysqldump.result
  mysql-test/t/mysqldump.test

 2841 Patrick Crews	2008-09-15 [merge]
      Bug#38903 - Test rpl.rpl_truncate_7ndb_2 failing
      Upmerge from 5.1 -> 6.0
      Moved to rpl_ndb_big suite to match location of rpl_truncate_7ndb
      Altered test path calling rpl_truncate_7ndb test as a source
      Re-recorded .result files to match main source file's results
renamed:
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2-master.opt
  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2.test
modified:
  mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2.test

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2008-06-28 11:00:59 +0000
+++ b/mysql-test/r/mysqldump.result	2008-09-15 20:39:24 +0000
@@ -1,3 +1,8 @@
+Bug#37938 - Test "mysqldump" lacks various insert statements
+Turn off concurrent inserts to avoid random errors
+NOTE:  We reset the variable back to saved value at the end of test
+SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT = 0;
 DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
 drop database if exists mysqldump_test_db;
 drop database if exists db1;
@@ -4090,6 +4095,7 @@ DROP DATABASE mysqldump_test_db;
 
 # -- End of test case for Bug#32538.
 
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # End of 5.1 tests
 #

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2008-06-28 11:00:59 +0000
+++ b/mysql-test/t/mysqldump.test	2008-09-15 20:39:24 +0000
@@ -5,6 +5,14 @@
 # Binlog is required
 --source include/have_log_bin.inc
 
+
+--echo Bug#37938 - Test "mysqldump" lacks various insert statements
+--echo Turn off concurrent inserts to avoid random errors
+--echo NOTE:  We reset the variable back to saved value at the end of test
+SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT = 0;
+
+
 --disable_warnings
 DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
 drop database if exists mysqldump_test_db;
@@ -1593,6 +1601,7 @@ DROP TABLE t1,t2;
 --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
 --exec $MYSQL_DUMP test
 
+
 --echo #
 --echo # End of 5.0 tests
 --echo #
@@ -1859,6 +1868,10 @@ DROP DATABASE mysqldump_test_db;
 --echo # -- End of test case for Bug#32538.
 --echo
 
+# We reset concurrent_inserts value to whatever it was at the start of the test
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
+
+
 ###########################################################################
 
 --echo #

Thread
bzr push into mysql-6.0 branch (patrick.crews:2841 to 2842) Bug#37938Patrick Crews15 Sep