summaryrefslogtreecommitdiff
path: root/mysql-test/suite/storage_engine
diff options
context:
space:
mode:
authorElena Stepanova <elenst@gmail.com>2013-11-07 03:36:53 +0400
committerElena Stepanova <elenst@gmail.com>2013-11-07 03:36:53 +0400
commitcdecd86a53f4935e31ffab2271babfcf7754da3b (patch)
tree9d4f8fe5d64c15d6fe8c2708dfc08725dbaa3ebb /mysql-test/suite/storage_engine
parentdcb3650d6305483c002477804c57162c466ce397 (diff)
downloadmariadb-git-cdecd86a53f4935e31ffab2271babfcf7754da3b.tar.gz
More verbose error messages
Diffstat (limited to 'mysql-test/suite/storage_engine')
-rw-r--r--mysql-test/suite/storage_engine/alter_tablespace.result2
-rw-r--r--mysql-test/suite/storage_engine/alter_tablespace.test1
-rw-r--r--mysql-test/suite/storage_engine/obfuscate.inc2
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.result b/mysql-test/suite/storage_engine/alter_tablespace.result
index 71ef910b222..5bbfe00e94b 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.result
+++ b/mysql-test/suite/storage_engine/alter_tablespace.result
@@ -10,7 +10,7 @@ a
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
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test
index ac206b8e328..9ac7f400e28 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.test
+++ b/mysql-test/suite/storage_engine/alter_tablespace.test
@@ -63,6 +63,7 @@ EOF
--source alter_table.inc
--let $error_codes = ER_GET_ERRNO
+ --replace_result $storage_engine <STORAGE_ENGINE>
SELECT a FROM t1;
--source check_errors.inc
if ($mysql_errname != ER_GET_ERRNO)
diff --git a/mysql-test/suite/storage_engine/obfuscate.inc b/mysql-test/suite/storage_engine/obfuscate.inc
index 96c9e5a2956..e1a8a5bede0 100644
--- a/mysql-test/suite/storage_engine/obfuscate.inc
+++ b/mysql-test/suite/storage_engine/obfuscate.inc
@@ -1,4 +1,4 @@
let $storage_engine_search_string = ENGINE=$storage_engine;
---replace_result ' ' ' ' ' ,' ',' ' )' ')' '( ' '(' $default_tbl_opts <CUSTOM_TABLE_OPTIONS> $int_indexed_col <INT_COLUMN> $char_indexed_col <CHAR_COLUMN> $int_col <INT_COLUMN> $char_col <CHAR_COLUMN> $default_col_indexed_opts <CUSTOM_COL_OPTIONS> $default_col_opts <CUSTOM_COL_OPTIONS> $storage_engine_search_string ENGINE=<STORAGE_ENGINE> $default_index <CUSTOM_INDEX>
+--replace_result ' ' ' ' ' ,' ',' ' )' ')' '( ' '(' $default_tbl_opts <CUSTOM_TABLE_OPTIONS> $int_indexed_col <INT_COLUMN> $char_indexed_col <CHAR_COLUMN> $int_col <INT_COLUMN> $char_col <CHAR_COLUMN> $default_col_indexed_opts <CUSTOM_COL_OPTIONS> $default_col_opts <CUSTOM_COL_OPTIONS> $storage_engine_search_string ENGINE=<STORAGE_ENGINE> $storage_engine <STORAGE_ENGINE> $default_index <CUSTOM_INDEX>