bzr commit into mysql-6.0-backup branch (ingo.struewing:2640)

[Ingo Struewing]

#At file:///home2/mydev/bzrroot/mysql-6.0-backup-clean/

 2640 Ingo Struewing	2008-06-26
      Disabled concurrent inserts in merge-sync.test to make results more stable.
modified:
  mysql-test/t/merge-sync.test

per-file messages:
  mysql-test/t/merge-sync.test
    Disabled concurrent inserts to make results more stable.
=== modified file 'mysql-test/t/merge-sync.test'
--- a/mysql-test/t/merge-sync.test	2008-04-29 09:22:04 +0000
+++ b/mysql-test/t/merge-sync.test	2008-06-26 13:43:20 +0000
@@ -15,6 +15,12 @@ drop database if exists mysqltest;
 --enable_warnings
 
 #
+# With concurrent inserts enabled, SELECT does not always see rows inserted
+# by another session immediately before. Disable it to get stable results.
+#
+SET GLOBAL concurrent_insert= 0;
+
+#
 # Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
 # Problem #1
 # A thread trying to lock a MERGE table performed busy waiting while
@@ -382,3 +388,8 @@ connection default;
 SET DEBUG_SYNC= 'RESET';
 DROP TABLE t1;
 
+#
+# Restore to default setting.
+#
+SET GLOBAL concurrent_insert= DEFAULT;
+