diff options
| author | Elena Stepanova <elenst@gmail.com> | 2013-11-08 23:21:26 +0400 |
|---|---|---|
| committer | Elena Stepanova <elenst@gmail.com> | 2013-11-08 23:21:26 +0400 |
| commit | 66ed34d6ed9af6e55867baf8ec7e38e052ff0296 (patch) | |
| tree | 64223d4d2986422db974b88a25cbffa1695b50b9 /storage/myisam/mysql-test | |
| parent | 949cb948dec42a045ff54a768d9ef103cc0d4465 (diff) | |
| download | mariadb-git-66ed34d6ed9af6e55867baf8ec7e38e052ff0296.tar.gz | |
More comprehensive error messages and codes
Diffstat (limited to 'storage/myisam/mysql-test')
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff | 6 | ||||
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff index bbbe6826494..70f94d67816 100644 --- a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff +++ b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff @@ -1,6 +1,6 @@ --- suite/storage_engine/alter_tablespace.result 2012-07-12 19:53:40.775419511 +0400 +++ suite/storage_engine/alter_tablespace.reject 2012-07-15 16:21:14.910435703 +0400 -@@ -1,19 +1,14 @@ +@@ -1,21 +1,14 @@ DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; ALTER TABLE t1 DISCARD TABLESPACE; @@ -13,8 +13,10 @@ -2 -ALTER TABLE t1 DISCARD TABLESPACE; -SELECT a FROM t1; --ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine <STORAGE_ENGINE> +-ERROR HY000: Tablespace has been discarded for table 't1' -ALTER TABLE t1 IMPORT TABLESPACE; +-Warnings: +-Warning 1810 <STORAGE_ENGINE>: IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification -SELECT a FROM t1; -a -1 diff --git a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff index 31da75e5ea5..205e7314fda 100644 --- a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff @@ -142,4 +142,4 @@ +# ------------------------------------------- DROP TABLE t2; DROP TABLE t1; -+ERROR 42S02: Unknown table 't1' ++ERROR 42S02: Unknown table 'test.t1' |