diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-07 07:52:40 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-07 07:52:40 +0100 |
| commit | 273bcb92c1c126bc9cfa973d925b8e1da1b3c1bb (patch) | |
| tree | 83055f4e798e2a1b832d9b5fb6f15c468eedf765 /storage/myisam | |
| parent | 3e1ae7a0beb09f5637b0373eec52e9537e6a64ae (diff) | |
| parent | e6c78988ed4d02181a4a1f9d27f034753e03218c (diff) | |
| download | mariadb-git-273bcb92c1c126bc9cfa973d925b8e1da1b3c1bb.tar.gz | |
Merge 10.0-base to 10.0
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff index 07c03fc8d3e..bbbe6826494 100644 --- a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff +++ b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff @@ -13,13 +13,13 @@ -2 -ALTER TABLE t1 DISCARD TABLESPACE; -SELECT a FROM t1; --ERROR HY000: Got error -1 from storage engine +-ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine <STORAGE_ENGINE> -ALTER TABLE t1 IMPORT TABLESPACE; -SELECT a FROM t1; -a -1 -2 -+ERROR HY000: Table storage engine for 't1' doesn't have this option ++ERROR HY000: Storage engine <STORAGE_ENGINE> of the table `test`.`t1` doesn't have this option +# ERROR: Statement ended with errno 1031, errname ER_ILLEGAL_HA (expected to succeed) +# ------------ UNEXPECTED RESULT ------------ +# [ ALTER TABLE t1 DISCARD TABLESPACE ] |