Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

mysql-test/r/delayed.result

@@ -250,3 +250,8 @@ SELECT HEX(a) FROM t1;
 HEX(a)
 1
 DROP TABLE t1;
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
+INSERT DELAYED INTO t2 VALUES(1);
+ERROR HY000: Table storage engine for 't2' doesn't have this option
+DROP TABLE t1, t2;

mysql-test/r/merge.result

@@ -803,11 +803,6 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
 SELECT * FROM tm1;
 ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
 DROP TABLE t1, tm1;
-CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
-CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
-INSERT DELAYED INTO t2 VALUES(1);
-ERROR HY000: Table storage engine for 't2' doesn't have this option
-DROP TABLE t1, t2;
 CREATE TABLE t1(c1 VARCHAR(1));
 CREATE TABLE m1 LIKE t1;
 ALTER TABLE m1 ENGINE=MERGE UNION=(t1);

mysql-test/t/delayed.test

@@ -242,3 +242,13 @@ INSERT DELAYED INTO t1 VALUES(1);
 FLUSH TABLE t1;
 SELECT HEX(a) FROM t1;
 DROP TABLE t1;
+
+#
+# Bug#26464 - insert delayed + update + merge = corruption
+#
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
+--error 1031
+INSERT DELAYED INTO t2 VALUES(1);
+DROP TABLE t1, t2;
+

mysql-test/t/init_connect.test

@@ -2,10 +2,11 @@
 # Test of init_connect variable
 #
 
+# should work with embedded server after mysqltest is fixed
+--source include/not_embedded.inc
+
 --source include/add_anonymous_users.inc
 
-# should work with embedded server after mysqltest is fixed
--- source include/not_embedded.inc
 connect (con0,localhost,root,,);
 connection con0;
 select hex(@a);

mysql-test/t/merge.test

@@ -430,16 +430,7 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
 SELECT * FROM tm1;
 DROP TABLE t1, tm1;
 
-#
-# Bug#26464 - insert delayed + update + merge = corruption
-#
-CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
-CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
---error 1031
-INSERT DELAYED INTO t2 VALUES(1);
-DROP TABLE t1, t2;
 
-#
 # BUG#26881 - Large MERGE tables report incorrect specification when no
 #             differences in tables
 #

mysql-test/t/mysqlbinlog-cp932.test

+# disabled in embedded until tools running is fixed with embedded
+--source include/not_embedded.inc
 -- source include/have_cp932.inc
 
 # Bug#16217 (mysql client did not know how not switch its internal charset)