summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorunknown <svoj@june.mysql.com>2007-06-07 13:53:23 +0500
committerunknown <svoj@june.mysql.com>2007-06-07 13:53:23 +0500
commit357cee4b8e9272b8bef4386e9c3a5acc9525b0e1 (patch)
treee968dc9a6540caeb50868196c6c51bc43da534d5 /mysql-test/t/merge.test
parentdb35c48c1595fa82ca516cdd0b11ca69fce80fdb (diff)
parent3560bac9e6be9dca6f705182da931a272ae74139 (diff)
downloadmariadb-git-357cee4b8e9272b8bef4386e9c3a5acc9525b0e1.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines mysql-test/r/key_cache.result: Auto merged mysql-test/r/lock.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/preload.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/repair.result: Auto merged mysql-test/r/rpl_failed_optimize.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/merge.test: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_open.c: Auto merged mysql-test/r/backup.result: Use local. mysql-test/r/sp.result: Use local. sql/sql_error.cc: Use local. sql/sql_error.h: Use local. sql/share/errmsg.txt: Manual merge. sql/sql_table.cc: Manual merge. storage/myisam/ha_myisam.cc: Manual merge. storage/myisammrg/ha_myisammrg.cc: Manual merge. storage/myisammrg/ha_myisammrg.h: Manual merge.
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test21
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 69e0b19ebf0..43638c55271 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -490,4 +490,25 @@ insert into t1 values (1);
drop table t2;
drop table t1;
+#
+# BUG#26976 - Missing table in merge not noted in related error msg + SHOW
+# CREATE TABLE fails
+#
+CREATE TABLE tm1(a INT) ENGINE=MERGE UNION=(t1, t2);
+--error 1168
+SELECT * FROM tm1;
+CHECK TABLE tm1;
+CREATE TABLE t1(a INT);
+--error 1168
+SELECT * FROM tm1;
+CHECK TABLE tm1;
+CREATE TABLE t2(a BLOB);
+--error 1168
+SELECT * FROM tm1;
+CHECK TABLE tm1;
+ALTER TABLE t2 MODIFY a INT;
+SELECT * FROM tm1;
+CHECK TABLE tm1;
+DROP TABLE tm1, t1, t2;
+
--echo End of 5.0 tests