bk commit into 5.0 tree (holyfoot:1.2488)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-20 17:53:55+04:00, holyfoot@stripped +6 -0
  tests fixed to work in embedded server

  mysql-test/r/delayed.result@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +5 -0
    result fixed

  mysql-test/r/merge.result@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +0 -5
    result fixed

  mysql-test/t/delayed.test@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +10 -0
    moved here from merge.test

  mysql-test/t/init_connect.test@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +3 -2
    test fixed as it created users, then stopped without deletion, what caused
    problems in consequent tests

  mysql-test/t/merge.test@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +0 -9
    moved to delayed.test

  mysql-test/t/mysqlbinlog-cp932.test@stripped, 2007-03-20 17:53:54+04:00, holyfoot@stripped +2 -0
    disabled in embedded server

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/build/mysql-5.0-build

--- 1.9/mysql-test/t/init_connect.test	2007-03-20 17:54:00 +04:00
+++ 1.10/mysql-test/t/init_connect.test	2007-03-20 17:54:00 +04:00
@@ -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);

--- 1.1/mysql-test/t/mysqlbinlog-cp932.test	2007-03-20 17:54:00 +04:00
+++ 1.2/mysql-test/t/mysqlbinlog-cp932.test	2007-03-20 17:54:00 +04:00
@@ -1,3 +1,5 @@
+# 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)

--- 1.13/mysql-test/r/delayed.result	2007-03-20 17:54:00 +04:00
+++ 1.14/mysql-test/r/delayed.result	2007-03-20 17:54:00 +04:00
@@ -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;

--- 1.58/mysql-test/r/merge.result	2007-03-20 17:54:00 +04:00
+++ 1.59/mysql-test/r/merge.result	2007-03-20 17:54:00 +04:00
@@ -803,11 +803,6 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT,
 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);

--- 1.17/mysql-test/t/delayed.test	2007-03-20 17:54:00 +04:00
+++ 1.18/mysql-test/t/delayed.test	2007-03-20 17:54:00 +04:00
@@ -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;
+

--- 1.48/mysql-test/t/merge.test	2007-03-20 17:54:00 +04:00
+++ 1.49/mysql-test/t/merge.test	2007-03-20 17:54:00 +04:00
@@ -430,16 +430,7 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT,
 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
 #