diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 19:30:49 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 19:30:49 +0100 |
| commit | 54d26e027f9b076b3588ec74342a37861af0ce0b (patch) | |
| tree | de394ff69e6896439558c94a82bc72f814d32386 /mysql-test/t/merge.test | |
| parent | 851534b5e99d39c52916f08cb6a27ac0305f621e (diff) | |
| parent | 7a10ede8ac35e72852e5443e3963f6f1db668268 (diff) | |
| download | mariadb-git-54d26e027f9b076b3588ec74342a37861af0ce0b.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index e49297dd06c..a4602a3b82a 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -599,6 +599,19 @@ SELECT * FROM t3; DROP TABLE t1, t2, t3; +# +# BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed +# +CREATE TABLE t1(a INT); +CREATE TABLE m1(a INT) ENGINE=MERGE; +SHOW CREATE TABLE m1; +DROP TABLE m1; +CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(); +SHOW CREATE TABLE m1; +ALTER TABLE m1 UNION=(t1); +ALTER TABLE m1 UNION=(); +SHOW CREATE TABLE m1; +DROP TABLE t1, m1; --echo End of 5.0 tests |