Fixes for storage_engine test suite

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

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)

mysql-test/suite/storage_engine/have_engine.inc

@@ -38,7 +38,7 @@ let $default_char_type = CHAR(8);
 
 if (!$ENGINE)
 {
-  --skip ERROR: Storage engine under test is not defined, export ENGINE env variable or set it in define_engine.inc
+  --skip Storage engine under test is not defined, export ENGINE env variable or set it in define_engine.inc
 }
 
 # Check that the storage engine is loaded. Here we don't need to worry about the case,

mysql-test/suite/storage_engine/misc.result

@@ -42,6 +42,8 @@ db	User	NULL	NULL
 event	db	NULL	NULL
 event	name	NULL	NULL
 func	name	NULL	NULL
+gtid_slave_pos	domain_id	NULL	NULL
+gtid_slave_pos	sub_id	NULL	NULL
 help_category	help_category_id	NULL	NULL
 help_category	name	NULL	NULL
 help_keyword	help_keyword_id	NULL	NULL
@@ -70,6 +72,9 @@ proxies_priv	Host	NULL	NULL
 proxies_priv	Proxied_host	NULL	NULL
 proxies_priv	Proxied_user	NULL	NULL
 proxies_priv	User	NULL	NULL
+roles_mapping	Host	NULL	NULL
+roles_mapping	Role	NULL	NULL
+roles_mapping	User	NULL	NULL
 servers	Server_name	NULL	NULL
 table_stats	db_name	NULL	NULL
 table_stats	table_name	NULL	NULL

mysql-test/suite/storage_engine/obfuscate.inc

 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>
 

mysql-test/suite/storage_engine/parts/repair_table.result

@@ -74,7 +74,6 @@ ERROR HY000: Failed to read from the .par file
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	Error	Failed to read from the .par file
-test.t1	check	Error	Incorrect information in file: './test/t1.frm'
 test.t1	check	error	Corrupt
 SELECT a,b FROM t1;
 ERROR HY000: Failed to read from the .par file
@@ -83,7 +82,6 @@ ERROR HY000: Failed to read from the .par file
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	Error	Failed to read from the .par file
-test.t1	repair	Error	Incorrect information in file: './test/t1.frm'
 test.t1	repair	error	Corrupt
 DROP TABLE t1, t2;
 call mtr.add_suppression("Got an error from thread_id=.*");

storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff

---- 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

storage/innobase/mysql-test/storage_engine/fulltext_search.rdiff

@@ -62,7 +62,7 @@
 -v0	rating
 -text1	178.11756896972656
 -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)
 +# ------------ UNEXPECTED RESULT ------------
 +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.
@@ -139,7 +139,7 @@
 -text1	190.56150817871094
 -text4	1.1758291721343994
 -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)
 +# ------------ UNEXPECTED RESULT ------------
 +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.

storage/innobase/mysql-test/storage_engine/index_enable_disable.rdiff

@@ -5,7 +5,7 @@
  t1	1	a	1	a	#	#	NULL	NULL	YES	BTREE		
  ALTER TABLE t1 DISABLE KEYS;
 +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;
  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	
@@ -18,7 +18,7 @@
  (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
  ALTER TABLE t1 ENABLE KEYS;
 +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;
  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		
@@ -27,7 +27,7 @@
  (21),(22),(23),(24),(25),(26),(27),(28),(29);
  ALTER TABLE t1 DISABLE KEYS;
 +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);
  ERROR 23000: Duplicate entry '29' for key 'a'
  # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 

storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff

@@ -4,7 +4,7 @@
  DROP TABLE IF EXISTS t1;
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
 +Warnings:
-+Warning	140	InnoDB: assuming ROW_FORMAT=COMPACT.
++Warning	140	<STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT.
  SHOW CREATE TABLE t1;
  Table	Create Table
  t1	CREATE TABLE `t1` (

storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff

@@ -698,7 +698,7 @@
 -WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
 -count(*)
 -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)
 +# ------------ UNEXPECTED RESULT ------------
 +# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ]

storage/innobase/mysql-test/storage_engine/vcol.rdiff

@@ -70,7 +70,7 @@
 -3	4
 -4	5
 -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)
 +# ------------ 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*/ ]

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 ]

storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff

@@ -13,7 +13,7 @@
 -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

storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff

@@ -62,7 +62,7 @@
 -v0	rating
 -text1	178.11756896972656
 -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)
 +# ------------ UNEXPECTED RESULT ------------
 +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.
@@ -139,7 +139,7 @@
 -text1	190.56150817871094
 -text4	1.1758291721343994
 -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)
 +# ------------ UNEXPECTED RESULT ------------
 +# The statement|command finished with ER_TABLE_CANT_HANDLE_FT.

storage/myisammrg/mysql-test/storage_engine/handler.rdiff

@@ -47,7 +47,7 @@
 -foobar	1000
 -HANDLER t1 CLOSE;
 -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 ------------
 +# The statement|command finished with ER_ILLEGAL_HA.
 +# Functionality or the syntax or the mix could be unsupported. 
@@ -84,5 +84,5 @@
 -a	b
 -200	b
 -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;

storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff

@@ -5,7 +5,7 @@
  t1	1	a	1	a	#	#	NULL	NULL	YES	BTREE		
  ALTER TABLE t1 DISABLE KEYS;
 +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;
  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	
@@ -18,7 +18,7 @@
  (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
  ALTER TABLE t1 ENABLE KEYS;
 +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;
  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		
@@ -27,7 +27,7 @@
  (21),(22),(23),(24),(25),(26),(27),(28),(29);
  ALTER TABLE t1 DISABLE KEYS;
 +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);
  ERROR 23000: Duplicate entry '29' for key 'a'
  # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 

storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff

 --- repair_table.result	2013-01-23 01:35:44.388267080 +0400
 +++ repair_table.reject	2013-01-23 03:16:26.468307847 +0400
-@@ -1,236 +1,114 @@
+@@ -1,234 +1,114 @@
  call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired");
  DROP TABLE IF EXISTS t1, t2;
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
@@ -123,7 +123,6 @@
  CHECK TABLE t1;
  Table	Op	Msg_type	Msg_text
 -test.t1	check	Error	Failed to read from the .par file
--test.t1	check	Error	Incorrect information in file: './test/t1.frm'
 -test.t1	check	error	Corrupt
 +test.t1	check	Error	Table 'test.t1' doesn't exist
 +test.t1	check	status	Operation failed
@@ -136,7 +135,6 @@
  REPAIR TABLE t1;
  Table	Op	Msg_type	Msg_text
 -test.t1	repair	Error	Failed to read from the .par file
--test.t1	repair	Error	Incorrect information in file: './test/t1.frm'
 -test.t1	repair	error	Corrupt
 +test.t1	repair	Error	Table 'test.t1' doesn't exist
 +test.t1	repair	status	Operation failed

storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff

@@ -37,7 +37,7 @@
 -HANDLER t1 OPEN AS h2;
 -HANDLER h2 READ FIRST;
 -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 ------------
 +# The statement|command finished with ER_ILLEGAL_HA.
 +# HANDLER or the syntax or the mix could be unsupported. 

storage/myisammrg/mysql-test/storage_engine/vcol.rdiff

@@ -70,7 +70,7 @@
 -3	4
 -4	5
 -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)
 +# ------------ 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 ]