#At file:///Users/pcrews/usr/local/bin/data1/work/mysqldump/mysql-5.1-bugteam/
2735 Patrick Crews 2008-09-08
Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Altered the .test file to turn concurrent inserts off. We reset concurrent_insert
to the original value at the end of the test
Re-recorded the .result file to account for the variable changes.
modified:
mysql-test/r/mysqldump.result
mysql-test/t/mysqldump.test
=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result 2008-04-24 14:50:38 +0000
+++ b/mysql-test/r/mysqldump.result 2008-09-08 23:31:43 +0000
@@ -1,3 +1,5 @@
+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;
@@ -4089,6 +4091,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-03-05 09:16:20 +0000
+++ b/mysql-test/t/mysqldump.test 2008-09-08 23:31:43 +0000
@@ -5,6 +5,16 @@
# Binlog is required
--source include/have_log_bin.inc
+# Bug #37938 - Test "mysqldump" lacks various insert statements
+# Disable concurrent inserts to avoid test failures
+# Found INSERT's weren't fully processed before calls to $MYSQLDUMP
+# This corrects the issue
+# NOTE: We reset concurrent_insert back to saved value at the end
+# of the test file
+
+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;
@@ -1859,6 +1869,10 @@ DROP DATABASE mysqldump_test_db;
--echo # -- End of test case for Bug#32538.
--echo
+
+# Set concurrent_insert back to what it was at the start of the test
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
+
###########################################################################
--echo #
