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.
      Commented out non-existent mysqltest command "warning" in innodb-autoinc.test.
      Fixed typo in backup_triggers_and_events.test.
modified:
  mysql-test/r/backup_triggers_and_events.result
  mysql-test/r/merge-sync.result
  mysql-test/t/backup_triggers_and_events.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/merge-sync.test

per-file messages:
  mysql-test/r/backup_triggers_and_events.result
    Fixed test result.
  mysql-test/r/merge-sync.result
    Fixed test result.
  mysql-test/t/backup_triggers_and_events.test
    Fixed typo.
  mysql-test/t/innodb-autoinc.test
    Commented out non-existent mysqltest command "warning".
  mysql-test/t/merge-sync.test
    Disabled concurrent inserts to make results more stable.
=== modified file 'mysql-test/r/backup_triggers_and_events.result'
--- a/mysql-test/r/backup_triggers_and_events.result	2008-06-25 10:03:42 +0000
+++ b/mysql-test/r/backup_triggers_and_events.result	2008-06-26 15:52:25 +0000
@@ -39,14 +39,8 @@ CALL trg_msg(OLD.a);
 ||
 USE test||
 DROP EVENT IF EXISTS ev||
-Warnings:
-Note	1305	Event ev does not exist
 DROP TABLE IF EXISTS t1||
-Warnings:
-Note	1051	Unknown table 't1'
 DROP TRIGGER IF EXISTS trg||
-Warnings:
-Note	1360	Trigger does not exist
 CREATE EVENT ev ON SCHEDULE EVERY 1 second DO
 BEGIN
 INSERT INTO test.logt(db, msg) VALUES ('test','Test event fired!');

=== modified file 'mysql-test/r/merge-sync.result'
--- a/mysql-test/r/merge-sync.result	2008-04-29 09:22:04 +0000
+++ b/mysql-test/r/merge-sync.result	2008-06-26 15:52:25 +0000
@@ -1,6 +1,7 @@
 SET DEBUG_SYNC= 'RESET';
 drop table if exists t1,t2,t3,t4,t5,t6;
 drop database if exists mysqltest;
+SET GLOBAL concurrent_insert= 0;
 CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
 CREATE TABLE t2 (c1 INT) ENGINE= MRG_MYISAM UNION= (t1) INSERT_METHOD= LAST;
 connection con1
@@ -149,3 +150,4 @@ connection con1
 connection default;
 SET DEBUG_SYNC= 'RESET';
 DROP TABLE t1;
+SET GLOBAL concurrent_insert= DEFAULT;

=== modified file 'mysql-test/t/backup_triggers_and_events.test'
--- a/mysql-test/t/backup_triggers_and_events.test	2008-06-25 10:03:42 +0000
+++ b/mysql-test/t/backup_triggers_and_events.test	2008-06-26 15:52:25 +0000
@@ -88,7 +88,7 @@ CALL trg_msg(OLD.a);
 
 USE test||
 
---disable_warnigns
+--disable_warnings
 DROP EVENT IF EXISTS ev||
 DROP TABLE IF EXISTS t1||
 DROP TRIGGER IF EXISTS trg||

=== modified file 'mysql-test/t/innodb-autoinc.test'
--- a/mysql-test/t/innodb-autoinc.test	2008-06-12 00:08:07 +0000
+++ b/mysql-test/t/innodb-autoinc.test	2008-06-26 15:52:25 +0000
@@ -23,7 +23,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (127, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -31,7 +31,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 TINYINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (255, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -41,7 +41,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 SMALLINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (32767, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -49,7 +49,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 SMALLINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (65535, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -59,7 +59,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 MEDIUMINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (8388607, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -67,7 +67,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 MEDIUMINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (16777215, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -77,7 +77,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (2147483647, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -94,7 +94,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (9223372036854775807, null);
 -- error ER_DUP_ENTRY,1062
--- warning ER_WARN_DATA_OUT_OF_RANGE,1264
+#-- warning ER_WARN_DATA_OUT_OF_RANGE,1264
 INSERT INTO t1 (c2) VALUES ('innodb');
 SELECT * FROM t1;
 DROP TABLE t1;

=== 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 15:52:25 +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;
+