database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysys/queues.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
This commit is contained in:
unknown
2006-09-29 00:23:43 +05:00
parent 0d7fdc9ee3 59a7f1ab5f
commit 70c6f7d227
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/merge.result
View File

@ -771,6 +771,12 @@ Table Op Msg_type Msg_text
test.t1 check status OK
test.t2 check status OK
drop table t1, t2, t3;
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(2),(1);
CREATE TABLE t2(a INT, KEY(a)) ENGINE=MERGE UNION=(t1);
SELECT * FROM t2 WHERE a=2;
ERROR HY000: Got error 124 from storage engine
DROP TABLE t1, t2;
CREATE TABLE t1(a INT) ENGINE=MEMORY;
CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
SELECT * FROM t2;