diff options
| author | unknown <svoj@april.(none)> | 2007-03-13 19:05:35 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-03-13 19:05:35 +0400 |
| commit | 6095508b71e24de8bd804258d84d97df52fdfcab (patch) | |
| tree | cbb79fc11c506b1ac882c864d66b75b068d12460 /mysql-test/r/merge.result | |
| parent | 4f20ff2fa28cab85e587bb91916f0a438623d476 (diff) | |
| parent | 968d1695a76f153bfe2007ff63ed1cbeb8b63a59 (diff) | |
| download | mariadb-git-6095508b71e24de8bd804258d84d97df52fdfcab.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 9dc2db39e9f..34f1b76ba05 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -811,6 +811,19 @@ CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1); INSERT DELAYED INTO t2 VALUES(1); ERROR HY000: Table storage engine for 't2' doesn't have this option DROP TABLE t1, t2; +CREATE TABLE t1(c1 VARCHAR(1)); +CREATE TABLE m1 LIKE t1; +ALTER TABLE m1 ENGINE=MERGE UNION=(t1); +SELECT * FROM m1; +c1 +DROP TABLE t1, m1; +CREATE TABLE t1(c1 VARCHAR(4), c2 TINYINT, c3 TINYINT, c4 TINYINT, +c5 TINYINT, c6 TINYINT, c7 TINYINT, c8 TINYINT, c9 TINYINT); +CREATE TABLE m1 LIKE t1; +ALTER TABLE m1 ENGINE=MERGE UNION=(t1); +SELECT * FROM m1; +c1 c2 c3 c4 c5 c6 c7 c8 c9 +DROP TABLE t1, m1; create table t1 (b bit(1)); create table t2 (b bit(1)); create table tm (b bit(1)) engine = merge union = (t1,t2); |