1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge chilla.local:/home/mydev/mysql-4.1-bug26464

into  chilla.local:/home/mydev/mysql-5.0-bug26464


mysql-test/t/merge.test:
  Auto merged
mysql-test/r/merge.result:
  Bug#26464 - insert delayed + update + merge = corruption
  Manual merge from 4.1
sql/ha_myisammrg.h:
  Bug#26464 - insert delayed + update + merge = corruption
  Manual merge from 4.1
This commit is contained in:
unknown
2007-03-06 10:34:14 +01:00
3 changed files with 15 additions and 2 deletions

View File

@@ -430,6 +430,15 @@ 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;
# End of 4.1 tests
#