diff options
| author | unknown <istruewing@stella.local> | 2007-10-09 14:18:10 +0200 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-10-09 14:18:10 +0200 |
| commit | 0249c0a54002052cf19331b2fb3eedccfd930682 (patch) | |
| tree | 4d5a1d04a6aadc767478926398505f2748429d98 /mysql-test/t/merge.test | |
| parent | 89568a9d2ae7db3d18f183a33bf7bdd6e0bbc549 (diff) | |
| parent | 659c47785d9bbf51cdd46d52f559b2d2c08dde02 (diff) | |
| download | mariadb-git-0249c0a54002052cf19331b2fb3eedccfd930682.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-bug15522
into stella.local:/home2/mydev/mysql-5.1-bug15522
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index fd479276b3b..a50588b1e78 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -511,4 +511,18 @@ SELECT * FROM tm1; CHECK TABLE tm1; DROP TABLE tm1, t1, t2; +# +# Bug#15522 - create ... select and with merge tables +# +# This was fixed together with Bug#20662 (Infinite loop in CREATE TABLE +# IF NOT EXISTS ... SELECT with locked tables). +# The new behavior for MERGE tables is consistent with the +# CREATE TABLE SELECT behavior for ordinary tables. +# +CREATE TABLE t1(c1 INT); +CREATE TABLE t2 (c1 INT) ENGINE=MERGE UNION=(t1) INSERT_METHOD=FIRST; +--error ER_UPDATE_TABLE_USED +CREATE TABLE IF NOT EXISTS t1 SELECT * FROM t2; +DROP TABLE t1, t2; + --echo End of 5.0 tests |