mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

More verbose error messages

Browse source
This commit is contained in:
Elena Stepanova 2013-11-07 03:36:53 +04:00
parent dcb3650d63
commit cdecd86a53
15 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/storage_engine/alter_tablespace.result
View file

@ -10,7 +10,7 @@ a
2 2
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
SELECT a FROM t1; 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; ALTER TABLE t1 IMPORT TABLESPACE;
SELECT a FROM t1; SELECT a FROM t1;
a a

1
mysql-test/suite/storage_engine/alter_tablespace.test
View file

@ -63,6 +63,7 @@ EOF
--source alter_table.inc --source alter_table.inc
--let $error_codes = ER_GET_ERRNO --let $error_codes = ER_GET_ERRNO
--replace_result $storage_engine <STORAGE_ENGINE>
SELECT a FROM t1; SELECT a FROM t1;
--source check_errors.inc --source check_errors.inc
if ($mysql_errname != ER_GET_ERRNO) if ($mysql_errname != ER_GET_ERRNO)

2
mysql-test/suite/storage_engine/obfuscate.inc
View file

@ -1,4 +1,4 @@
let $storage_engine_search_string = ENGINE=$storage_engine; 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>

11
storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff
View file

@ -1,11 +0,0 @@
--- suite/storage_engine/alter_tablespace.result 2013-01-13 01:03:49.133994000 +0400
+++ suite/storage_engine/alter_tablespace.reject 2013-01-13 01:04:04.398937286 +0400
@@ -10,7 +10,7 @@
2
ALTER TABLE t1 DISCARD TABLESPACE;
SELECT * FROM t1;
-ERROR HY000: Got error -1 from storage engine
+ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine
ALTER TABLE t1 IMPORT TABLESPACE;
SELECT * FROM t1;
a

4
storage/innobase/mysql-test/storage_engine/fulltext_search.rdiff
View file

@ -62,7 +62,7 @@
-v0 rating -v0 rating
-text1 178.11756896972656 -text1 178.11756896972656
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: The used table type doesn't support FULLTEXT indexes +ERROR HY000: The storage engine <STORAGE_ENGINE> doesn't support FULLTEXT indexes
+# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) +# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.
@ -139,7 +139,7 @@
-text1 190.56150817871094 -text1 190.56150817871094
-text4 1.1758291721343994 -text4 1.1758291721343994
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: The used table type doesn't support FULLTEXT indexes +ERROR HY000: The storage engine <STORAGE_ENGINE> doesn't support FULLTEXT indexes
+# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) +# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.

6
storage/innobase/mysql-test/storage_engine/index_enable_disable.rdiff
View file

@ -5,7 +5,7 @@
t1 1 a 1 a # # NULL NULL YES BTREE t1 1 a 1 a # # NULL NULL YES BTREE
ALTER TABLE t1 DISABLE KEYS; ALTER TABLE t1 DISABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine <STORAGE_ENGINE> of the table `test`.`t1` doesn't have this option
SHOW INDEX IN t1; SHOW INDEX IN t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
-t1 1 a 1 a # # NULL NULL YES BTREE disabled -t1 1 a 1 a # # NULL NULL YES BTREE disabled
@ -18,7 +18,7 @@
(11),(12),(13),(14),(15),(16),(17),(18),(19),(20); (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
ALTER TABLE t1 ENABLE KEYS; ALTER TABLE t1 ENABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine <STORAGE_ENGINE> of the table `test`.`t1` doesn't have this option
SHOW INDEX IN t1; SHOW INDEX IN t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t1 1 a 1 a # # NULL NULL YES BTREE t1 1 a 1 a # # NULL NULL YES BTREE
@ -27,7 +27,7 @@
(21),(22),(23),(24),(25),(26),(27),(28),(29); (21),(22),(23),(24),(25),(26),(27),(28),(29);
ALTER TABLE t1 DISABLE KEYS; ALTER TABLE t1 DISABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine <STORAGE_ENGINE> of the table `test`.`t1` doesn't have this option
INSERT INTO t1 (a) VALUES (29); INSERT INTO t1 (a) VALUES (29);
ERROR 23000: Duplicate entry '29' for key 'a' ERROR 23000: Duplicate entry '29' for key 'a'
# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY).

2
storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file

@ -698,7 +698,7 @@
-WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; -WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
-count(*) -count(*)
-1 -1
+ERROR HY000: The used table type doesn't support SPATIAL indexes +ERROR HY000: The storage engine <STORAGE_ENGINE> doesn't support SPATIAL indexes
+# ERROR: Statement ended with errno 1464, errname ER_TABLE_CANT_HANDLE_SPKEYS (expected to succeed) +# ERROR: Statement ended with errno 1464, errname ER_TABLE_CANT_HANDLE_SPKEYS (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ] +# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ]

2
storage/innobase/mysql-test/storage_engine/vcol.rdiff
View file

@ -70,7 +70,7 @@
-3 4 -3 4
-4 5 -4 5
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: InnoDB storage engine does not support computed columns +ERROR HY000: <STORAGE_ENGINE> storage engine does not support computed columns
+# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed) +# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ] +# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ]

4
storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff
View file

@ -13,13 +13,13 @@
-2 -2
-ALTER TABLE t1 DISCARD TABLESPACE; -ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT a FROM t1; -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; -ALTER TABLE t1 IMPORT TABLESPACE;
-SELECT a FROM t1; -SELECT a FROM t1;
-a -a
-1 -1
-2 -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) +# ERROR: Statement ended with errno 1031, errname ER_ILLEGAL_HA (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# [ ALTER TABLE t1 DISCARD TABLESPACE ] +# [ ALTER TABLE t1 DISCARD TABLESPACE ]

2
storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
View file

@ -13,7 +13,7 @@
-2 -2
-ALTER TABLE t1 DISCARD TABLESPACE; -ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT a FROM t1; -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; -ALTER TABLE t1 IMPORT TABLESPACE;
-SELECT a FROM t1; -SELECT a FROM t1;
-a -a

4
storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff
View file

@ -62,7 +62,7 @@
-v0 rating -v0 rating
-text1 178.11756896972656 -text1 178.11756896972656
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: The used table type doesn't support FULLTEXT indexes +ERROR HY000: The storage engine MRG_MyISAM doesn't support FULLTEXT indexes
+# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) +# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.
@ -139,7 +139,7 @@
-text1 190.56150817871094 -text1 190.56150817871094
-text4 1.1758291721343994 -text4 1.1758291721343994
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: The used table type doesn't support FULLTEXT indexes +ERROR HY000: The storage engine MRG_MyISAM doesn't support FULLTEXT indexes
+# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) +# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.

4
storage/myisammrg/mysql-test/storage_engine/handler.rdiff
View file

@ -47,7 +47,7 @@
-foobar 1000 -foobar 1000
-HANDLER t1 CLOSE; -HANDLER t1 CLOSE;
-ERROR 42S02: Unknown table 't1' in HANDLER -ERROR 42S02: Unknown table 't1' in HANDLER
+ERROR HY000: Table storage engine for 'h1' doesn't have this option +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ILLEGAL_HA. +# The statement|command finished with ER_ILLEGAL_HA.
+# Functionality or the syntax or the mix could be unsupported. +# Functionality or the syntax or the mix could be unsupported.
@ -84,5 +84,5 @@
-a b -a b
-200 b -200 b
-HANDLER h1 CLOSE; -HANDLER h1 CLOSE;
+ERROR HY000: Table storage engine for 'h1' doesn't have this option +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
DROP TABLE t1; DROP TABLE t1;

6
storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff
View file

@ -5,7 +5,7 @@
t1 1 a 1 a # # NULL NULL YES BTREE t1 1 a 1 a # # NULL NULL YES BTREE
ALTER TABLE t1 DISABLE KEYS; ALTER TABLE t1 DISABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
SHOW INDEX IN t1; SHOW INDEX IN t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
-t1 1 a 1 a # # NULL NULL YES BTREE disabled -t1 1 a 1 a # # NULL NULL YES BTREE disabled
@ -18,7 +18,7 @@
(11),(12),(13),(14),(15),(16),(17),(18),(19),(20); (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
ALTER TABLE t1 ENABLE KEYS; ALTER TABLE t1 ENABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
SHOW INDEX IN t1; SHOW INDEX IN t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t1 1 a 1 a # # NULL NULL YES BTREE t1 1 a 1 a # # NULL NULL YES BTREE
@ -27,7 +27,7 @@
(21),(22),(23),(24),(25),(26),(27),(28),(29); (21),(22),(23),(24),(25),(26),(27),(28),(29);
ALTER TABLE t1 DISABLE KEYS; ALTER TABLE t1 DISABLE KEYS;
+Warnings: +Warnings:
+Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
INSERT INTO t1 (a) VALUES (29); INSERT INTO t1 (a) VALUES (29);
ERROR 23000: Duplicate entry '29' for key 'a' ERROR 23000: Duplicate entry '29' for key 'a'
# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY).

2
storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff
View file

@ -37,7 +37,7 @@
-HANDLER t1 OPEN AS h2; -HANDLER t1 OPEN AS h2;
-HANDLER h2 READ FIRST; -HANDLER h2 READ FIRST;
-a b -a b
+ERROR HY000: Table storage engine for 'h1' doesn't have this option +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ILLEGAL_HA. +# The statement|command finished with ER_ILLEGAL_HA.
+# HANDLER or the syntax or the mix could be unsupported. +# HANDLER or the syntax or the mix could be unsupported.

2
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
View file

@ -70,7 +70,7 @@
-3 4 -3 4
-4 5 -4 5
-DROP TABLE t1; -DROP TABLE t1;
+ERROR HY000: MRG_MYISAM storage engine does not support computed columns +ERROR HY000: MRG_MyISAM storage engine does not support computed columns
+# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed) +# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ] +# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ]