diff --git a/mysql-test/suite/storage_engine/alter_tablespace.result b/mysql-test/suite/storage_engine/alter_tablespace.result
index 5bbfe00e94b..cca154d9611 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.result
+++ b/mysql-test/suite/storage_engine/alter_tablespace.result
@@ -10,8 +10,10 @@ a
 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/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test
index 9ac7f400e28..5dc62b659c6 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.test
+++ b/mysql-test/suite/storage_engine/alter_tablespace.test
@@ -62,11 +62,11 @@ EOF
   --let $alter_definition = DISCARD TABLESPACE
   --source alter_table.inc
 
-  --let $error_codes = ER_GET_ERRNO
+  --let $error_codes = ER_TABLESPACE_DISCARDED
   --replace_result $storage_engine <STORAGE_ENGINE>
   SELECT a FROM t1;
   --source check_errors.inc
-  if ($mysql_errname != ER_GET_ERRNO)
+  if ($mysql_errname != ER_TABLESPACE_DISCARDED)
   {
     --let $functionality = Tablespace operations
     --source unexpected_result.inc
diff --git a/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff b/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff
index 43178f00615..a6572ffa7f0 100644
--- a/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff
+++ b/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	<STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT.
++Warning	1478	<STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT.
  SHOW CREATE TABLE t1;
  Table	Create Table
  t1	CREATE TABLE `t1` (
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'
diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
index d66c6015596..aed79e92d2b 100644
--- a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
@@ -1,6 +1,6 @@
 --- alter_tablespace.result	2013-01-22 22:05:05.246633000 +0400
 +++ alter_tablespace.reject	2013-01-23 02:50:11.288110543 +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,18 +13,20 @@
 -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
 -2
-+ERROR HY000: 'test.t1' is not BASE TABLE
-+# ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed)
++ERROR HY000: Storage engine MRG_MyISAM 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 ]
-+# The statement|command finished with ER_WRONG_OBJECT.
-+# Tablespace operations or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
++# The statement|command finished with ER_ILLEGAL_HA.
++# Tablespace operations or the syntax or the mix could be unsupported. 
 +# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
 +# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
 +# Also, this problem may cause a chain effect (more errors of different kinds in the test).
diff --git a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff
index f716b7f2fe8..1fa6c184a6d 100644
--- a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff
@@ -144,4 +144,4 @@
 +# -------------------------------------------
  DROP TABLE t2;
  DROP TABLE t1;
-+ERROR 42S02: Unknown table 't1'
++ERROR 42S02: Unknown table 'test.t1'
diff --git a/storage/myisammrg/mysql-test/storage_engine/lock.rdiff b/storage/myisammrg/mysql-test/storage_engine/lock.rdiff
index 598e47b6883..f6bb75409d3 100644
--- a/storage/myisammrg/mysql-test/storage_engine/lock.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/lock.rdiff
@@ -33,11 +33,11 @@
 +ERROR 42S02: Table 'test.t1' doesn't exist
  DROP TABLE t1,t2;
 -ERROR HY000: Table 't2' was not locked with LOCK TABLES
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
 +# ERROR: Statement ended with errno 1051, errname ER_BAD_TABLE_ERROR (expected results: ER_TABLE_NOT_LOCKED)
  UNLOCK TABLES;
  DROP TABLE t1,t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  CREATE TABLE t3 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -66,7 +66,7 @@
 +# Also, this problem may cause a chain effect (more errors of different kinds in the test).
 +# -------------------------------------------
  DROP TABLE t1, t2, t3;
-+ERROR 42S02: Unknown table 't1,t2,t3'
++ERROR 42S02: Unknown table 'test.t1,test.t2,test.t3'
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  LOCK TABLE t1 READ, t2 READ;
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff
index d1934b9d2ac..7163aaefc53 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff
@@ -65,7 +65,7 @@
 +test.t2	analyze	Error	Table 'test.t2' doesn't exist
 +test.t2	analyze	status	Operation failed
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
 +ERROR HY000: Engine cannot be used in partitioned tables
 +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
@@ -84,4 +84,4 @@
 +test.t1	analyze	Error	Table 'test.t1' doesn't exist
 +test.t1	analyze	status	Operation failed
  DROP TABLE t1;
-+ERROR 42S02: Unknown table 't1'
++ERROR 42S02: Unknown table 'test.t1'
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff
index 21ccf192e08..5f7b7c75713 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff
@@ -119,7 +119,7 @@
 +test.t1	check	Error	Table 'test.t1' doesn't exist
 +test.t1	check	status	Operation failed
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
 +ERROR HY000: Engine cannot be used in partitioned tables
 +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
@@ -173,4 +173,4 @@
 +test.t1	check	Error	Table 'test.t1' doesn't exist
 +test.t1	check	status	Operation failed
  DROP TABLE t1;
-+ERROR 42S02: Unknown table 't1'
++ERROR 42S02: Unknown table 'test.t1'
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff
index 3d9ebdfe5c4..3223891b8ac 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff
@@ -42,7 +42,7 @@
 +Error	1146	Table 'test.t1' doesn't exist
 +Error	1146	Table 'test.t2' doesn't exist
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  DROP TABLE IF EXISTS t1,t2;
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2;
 +ERROR HY000: Engine cannot be used in partitioned tables
@@ -86,4 +86,4 @@
 +Error	1146	Table 'test.t1' doesn't exist
 +Error	1146	Table 'test.t2' doesn't exist
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff
index 242b3778846..2e2a1fecb8f 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff
@@ -80,7 +80,7 @@
 +test.t2	optimize	Error	Table 'test.t2' doesn't exist
 +test.t2	optimize	status	Operation failed
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
 +ERROR HY000: Engine cannot be used in partitioned tables
 +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
@@ -92,4 +92,4 @@
 +test.t1	optimize	Error	Table 'test.t1' doesn't exist
 +test.t1	optimize	status	Operation failed
  DROP TABLE t1;
-+ERROR 42S02: Unknown table 't1'
++ERROR 42S02: Unknown table 'test.t1'
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 59ebb4de421..d7bf99fd674 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
@@ -139,7 +139,7 @@
 +test.t1	repair	Error	Table 'test.t1' doesn't exist
 +test.t1	repair	status	Operation failed
  DROP TABLE t1, t2;
-+ERROR 42S02: Unknown table 't1,t2'
++ERROR 42S02: Unknown table 'test.t1,test.t2'
  call mtr.add_suppression("Got an error from thread_id=.*");
  call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
  call mtr.add_suppression(" '\..test.t1'");
@@ -298,4 +298,4 @@
 +test.t1	repair	Error	Table 'test.t1' doesn't exist
 +test.t1	repair	status	Operation failed
  DROP TABLE t1;
-+ERROR 42S02: Unknown table 't1'
++ERROR 42S02: Unknown table 'test.t1'