diff options
author | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
---|---|---|
committer | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
commit | a149769b2da4145ef12d6f3d57bb27dd6fa274e8 (patch) | |
tree | 8163c1306e6b7ceebe77cc93d6b8777df71fa9a6 /mysql-test/t/merge.test | |
parent | a947708760a572e44584b929991d6caded82dee7 (diff) | |
parent | aab816e7796a54f683df18498e14e7fe4832b742 (diff) | |
download | mariadb-git-a149769b2da4145ef12d6f3d57bb27dd6fa274e8.tar.gz |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r-- | mysql-test/t/merge.test | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index e132c33ab7f..e150b6b3a9a 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -434,16 +434,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 # |