Commit ef1d6cca authored by Patrick Crews's avatar Patrick Crews
Browse files

Bug#37938 Test "mysqldump" lacks various INSERT statements / values 

Moved fix for this bug to 5.0 as other mysqldump bugs seem tied to concurrent_insert being on
Setting concurrent_insert off during this test as INSERTs weren't being 
completely processed before the calls to mysqldump, resulting in failing tests.

Altered .test file to turn concurrent_insert off during the test and to restore it
to whatever the value was at the start of the test when complete.

Re-recorded .result file to account for changes to variables in the test.
parent 95af2754

mysql-test/r/mysqldump.result

+6 −0
Original line number Diff line number Diff line 
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;
@@ -3565,6 +3570,7 @@ DROP TABLE t1,t2; 




-- Dump completed on DATE

SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;

#

# End of 5.0 tests

#

mysql-test/t/mysqldump.test

+12 −0
Original line number Diff line number Diff line
@@ -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;
@@ -1594,6 +1602,10 @@ 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 # End of 5.0 tests

--echo #