diff options
author | unknown <istruewing@chilla.local> | 2007-06-16 13:14:23 +0200 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2007-06-16 13:14:23 +0200 |
commit | d69c6627ba277f9eee679d99842951ec61d5bc17 (patch) | |
tree | e063d56f114609d27cc4a326f312c701ef90cded /mysql-test/t/merge.test | |
parent | d38d29c363f6d783f22528fd2befa9543e06c4e9 (diff) | |
parent | df2e2a94a80d333d97645779a27f3ac378df353d (diff) | |
download | mariadb-git-d69c6627ba277f9eee679d99842951ec61d5bc17.tar.gz |
Merge chilla.local:/home/mydev/mysql-5.1-amain
into chilla.local:/home/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/mysqld.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r-- | mysql-test/t/merge.test | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index e136dc0ca3c..fd479276b3b 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 |