Merge 10.0-base to 10.0

7 files changed, 11 insertions, 13 deletions

diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
index 1091d6250b9..d66c6015596 100644
--- a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
+++ b/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
diff --git a/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff b/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff
index 7234cdfd2fa..c96b697167c 100644
--- a/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff
+++ b/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.
diff --git a/storage/myisammrg/mysql-test/storage_engine/handler.rdiff b/storage/myisammrg/mysql-test/storage_engine/handler.rdiff
index c56cfae0e3a..9e9117e04fc 100644
--- a/storage/myisammrg/mysql-test/storage_engine/handler.rdiff
+++ b/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;
diff --git a/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff b/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff
index 7b89e177ffb..357d4e931d2 100644
--- a/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff
+++ b/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). 
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
index 2b5d5f68346..59ebb4de421 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
@@ -1,6 +1,6 @@
 --- 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
diff --git a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff
index e4de81bae70..bb2e5585910 100644
--- a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff
+++ b/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. 
diff --git a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
index 8b2710be221..c7372326fad 100644
--- a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
+++ b/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 ]