diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-12 08:50:31 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-12 08:50:31 -0700 |
| commit | 93c397f9fa1e3e9dd62114ea8208557cdce21c29 (patch) | |
| tree | c121f9008dc34c930ea0ddea7f5aa7820c8cd84a /mysql-test/r/merge.result | |
| parent | a8c13c34a1b39b1f1fe06458b95f46b900576a51 (diff) | |
| parent | dac69dd4a2179a4bfbfacb22b41969c015f07d2d (diff) | |
| download | mariadb-git-93c397f9fa1e3e9dd62114ea8208557cdce21c29.tar.gz | |
manual merge bug#10952
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 538f1fa1a20..2f5f382028a 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -771,3 +771,11 @@ Table Op Msg_type Msg_text test.t1 check status OK test.t2 check status OK drop table t1, t2, t3; +drop table if exists t1; +Warnings: +Note 1051 Unknown table 't1' +create table t1 (c char(20)) engine=MyISAM; +insert into t1 values ("Monty"),("WAX"),("Walrus"); +alter table t1 engine=MERGE; +ERROR HY000: Table storage engine for 't1' doesn't have this option +drop table t1; |