From 5a7553f36a3eb18ca191607937ce1c67cbfc772d Mon Sep 17 00:00:00 2001
From: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
Date: Mon, 12 Nov 2012 22:31:30 +0900
Subject: Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT
 BTR_LIFT_PAGE_UP()

btr_lift_page_up() writes wrong page number (different by -1) for upper than father page.
But in almost all of the cases, the father page should be root page, no upper
pages. It is very rare path.

In addition the leaf page should not be lifted unless the father page is root.
Because the branch pages should not become the leaf pages.

rb://1336 approved by Marko Makela.
---
 .../suite/innodb/r/innodb_bug14676111.result       |  53 +++++++++
 mysql-test/suite/innodb/t/innodb_bug14676111.test  | 128 +++++++++++++++++++++
 2 files changed, 181 insertions(+)
 create mode 100644 mysql-test/suite/innodb/r/innodb_bug14676111.result
 create mode 100644 mysql-test/suite/innodb/t/innodb_bug14676111.test

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_bug14676111.result b/mysql-test/suite/innodb/r/innodb_bug14676111.result
new file mode 100644
index 00000000000..ebecd1d00cb
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug14676111.result
@@ -0,0 +1,53 @@
+drop table if exists t1;
+CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
+set global innodb_limit_optimistic_insert_debug = 2;
+insert into t1 values (1);
+insert into t1 values (5);
+insert into t1 values (4);
+insert into t1 values (3);
+insert into t1 values (2);
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+10.0000
+delete from t1 where a=4;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+8.0000
+delete from t1 where a=5;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+5.0000
+set global innodb_limit_optimistic_insert_debug = 10000;
+delete from t1 where a=2;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+3.0000
+insert into t1 values (2);
+delete from t1 where a=2;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+2.0000
+insert into t1 values (2);
+delete from t1 where a=2;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+DATA_LENGTH / 16384
+1.0000
+drop table t1;
diff --git a/mysql-test/suite/innodb/t/innodb_bug14676111.test b/mysql-test/suite/innodb/t/innodb_bug14676111.test
new file mode 100644
index 00000000000..fadd111fdc9
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug14676111.test
@@ -0,0 +1,128 @@
+# Test for bug #14676111: WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT_PAGE_UP()
+
+-- source include/have_innodb.inc
+-- source include/have_debug.inc
+
+if (`select count(*)=0 from information_schema.global_variables where variable_name = 'INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG'`)
+{
+  --skip Test requires InnoDB built with UNIV_DEBUG definition.
+}
+
+--disable_query_log
+set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
+--enable_query_log
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
+
+let $wait_condition=
+  SELECT VARIABLE_VALUE < 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  WHERE VARIABLE_NAME = 'INNODB_PURGE_TRX_ID_AGE';
+
+#
+# make 4 leveled straight tree
+#
+set global innodb_limit_optimistic_insert_debug = 2;
+insert into t1 values (1);
+insert into t1 values (5);
+#current tree form
+# (1, 5)
+
+insert into t1 values (4);
+#records in a page is limited to 2 artificially. root rise occurs
+#current tree form
+#   (1, 5)
+#(1, 4) (5)
+
+insert into t1 values (3);
+#current tree form
+#    (1, 5)
+#  (1, 4) (5)
+#(1, 3) (4) (5)
+
+insert into t1 values (2);
+#current tree form
+#      (1, 5)
+#    (1, 4) (5)
+#  (1, 3) (4) (5)
+#(1, 2) (3) (4) (5)
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+delete from t1 where a=4;
+--source include/wait_condition.inc
+#deleting 1 record of 2 records don't cause merge artificially.
+#current tree form
+#      (1, 5)
+#    (1)    (5)
+#  (1, 3)     (5)
+#(1, 2) (3)     (5)
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+delete from t1 where a=5;
+--source include/wait_condition.inc
+#deleting 1 record of 2 records don't cause merge artificially.
+#current tree form
+#      (1)
+#    (1)
+#  (1, 3) <- lift up this level next, when deleting node ptr
+#(1, 2) (3) <- merged next
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+#
+# cause merge at level 0
+#
+
+#disable the artificial limitation of records in a page
+set global innodb_limit_optimistic_insert_debug = 10000;
+delete from t1 where a=2;
+--source include/wait_condition.inc
+#merge page occurs. and lift up occurs.
+#current tree form
+#      (1)
+#    (1)
+#  (1, 3)
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+insert into t1 values (2);
+#current tree form
+#      (1)
+#    (1) <- lift up this level next, because it is not root
+#  (1, 2, 3)
+
+delete from t1 where a=2;
+--source include/wait_condition.inc
+#current tree form
+#      (1)
+#    (1, 3)
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+insert into t1 values (2);
+#current tree form
+#      (1)
+#    (1, 2, 3) <- lift up this level next, because the father is root
+
+delete from t1 where a=2;
+--source include/wait_condition.inc
+#current tree form
+#      (1, 3)
+
+analyze table t1;
+select DATA_LENGTH / 16384 from information_schema.TABLES where TABLE_SCHEMA = 'test' and TABLE_NAME = 't1';
+
+drop table t1;
+
+--disable_query_log
+set global innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
+--enable_query_log
-- 
cgit v1.2.1


From e42cd2db9107b7f527ffed2adfaa3c5d5b1cb11a Mon Sep 17 00:00:00 2001
From: Jimmy Yang <jimmy.yang@oracle.com>
Date: Wed, 14 Nov 2012 17:00:41 +0800
Subject: Fix Bug #14753402 - FAILING ASSERTION: LEN == IFIELD->FIXED_LEN

rb://1411 approved by Marko
---
 mysql-test/suite/innodb/r/innodb_bug14753402.result |  5 +++++
 mysql-test/suite/innodb/t/innodb_bug14753402.test   | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 mysql-test/suite/innodb/r/innodb_bug14753402.result
 create mode 100644 mysql-test/suite/innodb/t/innodb_bug14753402.test

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_bug14753402.result b/mysql-test/suite/innodb/r/innodb_bug14753402.result
new file mode 100644
index 00000000000..032542df59f
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug14753402.result
@@ -0,0 +1,5 @@
+CREATE TABLE bug14753402(a34 INT, col8953 NATIONAL CHAR(231) NOT NULL)
+ENGINE=INNODB ROW_FORMAT=REDUNDANT;
+INSERT INTO bug14753402 VALUES(1, 'aa');
+CREATE INDEX idx1 ON bug14753402(col8953(165));
+DROP TABLE bug14753402;
diff --git a/mysql-test/suite/innodb/t/innodb_bug14753402.test b/mysql-test/suite/innodb/t/innodb_bug14753402.test
new file mode 100644
index 00000000000..7fa758fc5ad
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug14753402.test
@@ -0,0 +1,13 @@
+#
+# Test Bug 14753402 - FAILING ASSERTION: LEN == IFIELD->FIXED_LEN
+#
+-- source include/have_innodb.inc
+
+CREATE TABLE bug14753402(a34 INT, col8953 NATIONAL CHAR(231) NOT NULL)
+ENGINE=INNODB ROW_FORMAT=REDUNDANT;
+
+INSERT INTO bug14753402 VALUES(1, 'aa');
+
+CREATE INDEX idx1 ON bug14753402(col8953(165));
+
+DROP TABLE bug14753402;
-- 
cgit v1.2.1


From 64dcbd6a498e176d80e9315cc8ec965f6bcb9e5a Mon Sep 17 00:00:00 2001
From: Satya Bodapati <satya.bodapati@oracle.com>
Date: Mon, 19 Nov 2012 14:58:51 +0530
Subject: Bug#14147491 - INFINITE LOOP WHEN OPENING A CORRUPTED TABLE

This bug is fixed by Bug#14251529. Only testcase from the
contribution is used.
---
 .../suite/innodb/r/innodb_bug14147491.result       | 17 +++++
 .../suite/innodb/t/innodb_bug14147491-master.opt   |  1 +
 mysql-test/suite/innodb/t/innodb_bug14147491.test  | 75 ++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 mysql-test/suite/innodb/r/innodb_bug14147491.result
 create mode 100644 mysql-test/suite/innodb/t/innodb_bug14147491-master.opt
 create mode 100644 mysql-test/suite/innodb/t/innodb_bug14147491.test

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_bug14147491.result b/mysql-test/suite/innodb/r/innodb_bug14147491.result
new file mode 100644
index 00000000000..6279f85f676
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug14147491.result
@@ -0,0 +1,17 @@
+CALL mtr.add_suppression("InnoDB: Error: Unable to read tablespace .* page no .* into the buffer pool after 100 attempts");
+CALL mtr.add_suppression("InnoDB: Warning: database page corruption or a failed");
+# Create and populate the table to be corrupted
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
+INSERT INTO t1 (b) VALUES ('corrupt me');
+INSERT INTO t1 (b) VALUES ('corrupt me');
+# Restart server to flush buffers
+# Corrupt the table
+Munged a string.
+Munged a string.
+# Write file to make mysql-test-run.pl expect crash and restart
+SELECT * FROM t1;
+ERROR HY000: Lost connection to MySQL server during query
+# Turn on reconnect
+# Wait for server to fully start
+# Cleanup
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb_bug14147491-master.opt b/mysql-test/suite/innodb/t/innodb_bug14147491-master.opt
new file mode 100644
index 00000000000..6b82baca147
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug14147491-master.opt
@@ -0,0 +1 @@
+--innodb_file_per_table=1 --skip-stack-trace --skip-core-file
diff --git a/mysql-test/suite/innodb/t/innodb_bug14147491.test b/mysql-test/suite/innodb/t/innodb_bug14147491.test
new file mode 100644
index 00000000000..ee3519c53fc
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug14147491.test
@@ -0,0 +1,75 @@
+#
+# Test opening a corrupted table.
+#
+
+# Don't test under valgrind, memory leaks will occur
+source include/not_valgrind.inc;
+# Avoid CrashReporter popup on Mac
+source include/not_crashrep.inc;
+# Don't test under embedded
+source include/not_embedded.inc;
+# Require InnoDB
+source include/have_innodb.inc;
+
+CALL mtr.add_suppression("InnoDB: Error: Unable to read tablespace .* page no .* into the buffer pool after 100 attempts");
+CALL mtr.add_suppression("InnoDB: Warning: database page corruption or a failed");
+
+--echo # Create and populate the table to be corrupted
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
+INSERT INTO t1 (b) VALUES ('corrupt me');
+--disable_query_log
+--let $i = 10
+while ($i)
+{
+  INSERT INTO t1 (b) VALUES (REPEAT('abcdefghijklmnopqrstuvwxyz', 100));
+  dec $i;
+}
+--enable_query_log
+INSERT INTO t1 (b) VALUES ('corrupt me');
+
+--echo # Restart server to flush buffers
+source include/restart_mysqld.inc;
+
+--echo # Corrupt the table
+let $MYSQLD_DATADIR=`select @@datadir`;
+let t1_IBD = $MYSQLD_DATADIR/test/t1.ibd;
+
+perl;
+use strict;
+use warnings;
+use Fcntl qw(:DEFAULT :seek);
+
+my $ibd_file = $ENV{'t1_IBD'};
+
+my $chunk;
+my $len;
+
+sysopen IBD_FILE, $ibd_file, O_RDWR || die "Unable to open $ibd_file";
+
+while ($len = sysread IBD_FILE, $chunk, 1024)
+{
+  if ($chunk =~ s/corrupt me/korrupt me/)
+  {
+    print "Munged a string.\n";
+    sysseek IBD_FILE, -$len, SEEK_CUR;
+    syswrite IBD_FILE, $chunk, $len;
+  }
+}
+
+close IBD_FILE;
+EOF
+
+--echo # Write file to make mysql-test-run.pl expect crash and restart
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--error 2013
+SELECT * FROM t1;
+
+--echo # Turn on reconnect
+--enable_reconnect
+
+--echo # Wait for server to fully start
+--source include/wait_until_connected_again.inc
+
+--echo # Cleanup
+DROP TABLE t1;
-- 
cgit v1.2.1


From e7ad5e36d467eff8faf5b39bfbc11af3469aed8d Mon Sep 17 00:00:00 2001
From: Olav Sandstaa <olav.sandstaa@oracle.com>
Date: Tue, 15 Jan 2013 08:52:38 +0100
Subject: Fix for Bug#14636211 WRONG RESULT (EXTRA ROW) ON A FROM SUBQUERY     
                 WITH A VARIABLE AND ORDER BY         Bug#16035412 MYSQL
 SERVER 5.5.29 WRONG SORTING USING COMPLEX INDEX

This is a fix for a regression introduced by Bug#12667154:
Bug#12667154 attempted to fix a performance problem with subqueries
that did filesort. For doing filesort, the optimizer creates a quick
select object to use when building the sort index. This quick select
object was deleted after the first call to create_sort_index(). Thus,
for queries where the subquery was executed multiple times, the quick
object was only used for the first execution. For all later executions
of the subquery, filesort used a complete table scan for building the
sort index. The fix for Bug#12667154 tried to fix this by not deleting
the quick object after the first execution of create_sort_index() so
that it would be re-used for building the sort index by the following
executions of the subquery.

This regression introduced in Bug#12667154 is that due to not deleting
the quick select object after building the sort index, the quick
object could in some cases be used also during the second phase of the
execution of the subquery instead of using the created sort
index. This caused wrong results to be returned.

The fix for this issue is to delete the reference to the select object
after it has been used in create_sort_index(). In this way the select
and quick objects will not be available when doing the second phase
of the execution of the select operation. To ensure that the select
object can be re-used for the following executions of the subquery
we make a copy of the select pointer. This is used for restoring the
select object after the select operation is completed.


mysql-test/suite/innodb/r/innodb_mysql.result:
  Changed explain output: The explain now contains "Using where" since we
  have restored the select pointer after doing the filesort operation.
sql/sql_select.cc:
  Change create_sort_index() so that it always sets the pointer to
  the select object to NULL. This is done in order to avoid that the
  select->quick object can be used when execution the main part of
  the select operation.
sql/sql_select.h:
  New member in JOIN_TAB: saved_select. Used by create_sort_index to
  make a backup copy of the select pointer.
---
 mysql-test/suite/innodb/r/innodb_mysql.result | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index 96ff02e2585..f7bffe2fc54 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -1738,7 +1738,7 @@ SELECT 1 FROM (SELECT COUNT(DISTINCT c1)
 FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	
-2	DERIVED	t1	ALL	c3,c2	c3	5		5	Using filesort
+2	DERIVED	t1	ALL	c3,c2	c3	5		5	Using where; Using filesort
 DROP TABLE t1;
 CREATE TABLE t1 (c1 REAL, c2 REAL, c3 REAL, KEY (c3), KEY (c2, c3))
 ENGINE=InnoDB;
@@ -1752,7 +1752,7 @@ SELECT 1 FROM (SELECT COUNT(DISTINCT c1)
 FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	
-2	DERIVED	t1	ALL	c3,c2	c3	9		5	Using filesort
+2	DERIVED	t1	ALL	c3,c2	c3	9		5	Using where; Using filesort
 DROP TABLE t1;
 CREATE TABLE t1 (c1 DECIMAL(12,2), c2 DECIMAL(12,2), c3 DECIMAL(12,2), 
 KEY (c3), KEY (c2, c3))
@@ -1767,7 +1767,7 @@ SELECT 1 FROM (SELECT COUNT(DISTINCT c1)
 FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	
-2	DERIVED	t1	ALL	c3,c2	c3	7		5	Using filesort
+2	DERIVED	t1	ALL	c3,c2	c3	7		5	Using where; Using filesort
 DROP TABLE t1;
 End of 5.1 tests
 #
-- 
cgit v1.2.1


From 163882665eed8c065953bdce05aaa152b6b5df0f Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 9 Apr 2013 15:34:17 +0200
Subject: * don't use 1-8 numbers for open_table_error codes, use an enum. *
 print "table doesn't exist in engine" when a table doesn't exist in the
 engine,   instead of "file not found" (if no file was involved) * print a
 complete filename that cannot be found ('t1.MYI', not 't1') * it's not an
 error for a DROP if a table doesn't exist in the engine (or some table  
 files cannot be found) - if the DROP succeeded regardless

---
 mysql-test/suite/innodb/r/innodb_mysql.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index b2df98bbfa6..d963c4cc89b 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -630,7 +630,7 @@ a
 DROP TABLE t1,t2,t3;
 create table t1 (a int) engine=innodb;
 select * from bug29807;
-ERROR 42S02: Table 'test.bug29807' doesn't exist
+ERROR 42S02: Table 'test.bug29807' doesn't exist in engine
 drop table t1;
 drop table bug29807;
 ERROR 42S02: Unknown table 'bug29807'
-- 
cgit v1.2.1


From a489ae89b9ffe427963745f13c44e1e4d67494f4 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 9 Apr 2013 15:47:25 +0200
Subject: fix mysql_rm_table_no_locks() not to use dd_frm_type, because the frm
 file may not exist (the table exists only in the engine).

---
 mysql-test/suite/innodb/r/innodb_mysql.result | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index d963c4cc89b..7247b26e86b 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -633,9 +633,10 @@ select * from bug29807;
 ERROR 42S02: Table 'test.bug29807' doesn't exist in engine
 drop table t1;
 drop table bug29807;
-ERROR 42S02: Unknown table 'bug29807'
-create table bug29807 (a int);
-drop table bug29807;
+Warnings:
+Warning	155	Table 'test.bug29807' doesn't exist in engine
+call mtr.add_suppression("InnoDB: Error: table .test...bug29807. does not exist in the InnoDB internal");
+call mtr.add_suppression("Cannot find or open table test\/bug29807 from");
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 CREATE TABLE t2 (a INT) ENGINE=InnoDB;
 switch to connection c1
-- 
cgit v1.2.1


From 3ad01d00f2eaef56ed06041f7ac26328e998155b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 9 Apr 2013 23:27:07 +0200
Subject: error messages: name the storage engine explicitly, instead of "used
 storage engine" and similar changes.

---
 .../suite/innodb/r/innodb-create-options.result    | 120 ++++++++++-----------
 mysql-test/suite/innodb/r/innodb-index.result      |  10 +-
 mysql-test/suite/innodb/r/innodb-zip.result        |  84 +++++++--------
 mysql-test/suite/innodb/r/innodb.result            |   6 +-
 .../suite/innodb/r/innodb_bug12400341.result       |   2 +-
 mysql-test/suite/innodb/r/innodb_bug46000.result   |   2 +-
 mysql-test/suite/innodb/r/innodb_gis.result        |   2 +-
 .../suite/innodb/t/innodb-create-options.test      |  76 ++++++-------
 mysql-test/suite/innodb/t/innodb-index.test        |  10 +-
 9 files changed, 156 insertions(+), 156 deletions(-)

(limited to 'mysql-test/suite/innodb')

diff --git a/mysql-test/suite/innodb/r/innodb-create-options.result b/mysql-test/suite/innodb/r/innodb-create-options.result
index c73baa60d42..c32af26c22d 100644
--- a/mysql-test/suite/innodb/r/innodb-create-options.result
+++ b/mysql-test/suite/innodb/r/innodb-create-options.result
@@ -10,11 +10,11 @@ Note	1051	Unknown table 't1'
 #         'FIXED' is sent to InnoDB since it is used by MyISAM.
 #         But it is an invalid mode in InnoDB
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
@@ -46,11 +46,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	
@@ -58,23 +58,23 @@ t1	Compact
 #         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
 Level	Code	Message
@@ -104,29 +104,29 @@ t1	Compressed	key_block_size=16
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT );
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
 Level	Code	Message
@@ -146,11 +146,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	row_format=COMPACT
 ALTER TABLE t1 KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -158,11 +158,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Redundant	row_format=REDUNDANT
 ALTER TABLE t1 KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
 SHOW WARNINGS;
 Level	Code	Message
@@ -170,11 +170,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Dynamic	row_format=DYNAMIC
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
 Level	Code	Message
@@ -212,23 +212,23 @@ t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
 Level	Code	Message
@@ -250,11 +250,11 @@ t1	Compact	row_format=COMPACT
 # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
 #         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
 #         and that they can be set to default values during strict mode.
@@ -263,23 +263,23 @@ DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -298,34 +298,34 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
 Level	Code	Message
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SET GLOBAL innodb_file_format=Barracuda;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_format=Antelope;
 ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
@@ -340,23 +340,23 @@ SET GLOBAL innodb_file_format=Barracuda;
 SET GLOBAL innodb_file_per_table=OFF;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -375,23 +375,23 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
 Level	Code	Message
 ALTER TABLE t1 KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -415,12 +415,12 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_per_table=OFF;
 ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result
index 4b032ebabb5..9130b3a4ef2 100644
--- a/mysql-test/suite/innodb/r/innodb-index.result
+++ b/mysql-test/suite/innodb/r/innodb-index.result
@@ -545,7 +545,7 @@ t4	CREATE TABLE `t4` (
   CONSTRAINT `dc` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t3 add constraint dc foreign key (a) references t1(a);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 121 "Duplicate key on write or update")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 121 "Duplicate key on write or update")
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -1146,17 +1146,17 @@ PRIMARY KEY (c1)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL;
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1);
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result
index f794ae7470f..5bb97e785a2 100644
--- a/mysql-test/suite/innodb/r/innodb-zip.result
+++ b/mysql-test/suite/innodb/r/innodb-zip.result
@@ -193,11 +193,11 @@ drop table t1;
 set innodb_strict_mode = on;
 create table t1 (id int primary key) engine = innodb key_block_size = 0;
 create table t2 (id int primary key) engine = innodb key_block_size = 9;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 create table t3 (id int primary key) engine = innodb key_block_size = 1;
 create table t4 (id int primary key) engine = innodb key_block_size = 2;
 create table t5 (id int primary key) engine = innodb key_block_size = 4;
@@ -225,25 +225,25 @@ create table t1 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compressed;
 create table t2 (id int primary key) engine = innodb
 key_block_size = 8 row_format = redundant;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 create table t3 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compact;
-ERROR HY000: Can't create table 'test.t3' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t3' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 create table t4 (id int primary key) engine = innodb
 key_block_size = 8 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t4' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t4' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 create table t5 (id int primary key) engine = innodb
 key_block_size = 8 row_format = default;
 SELECT table_schema, table_name, row_format, data_length, index_length
@@ -254,74 +254,74 @@ test	t5	Compressed	8192	0
 drop table t1, t5;
 create table t1 (id int primary key) engine = innodb
 key_block_size = 9 row_format = redundant;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	140	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = compact;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	140	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	140	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 SELECT table_schema, table_name, row_format, data_length, index_length
 FROM information_schema.tables WHERE engine='innodb';
 table_schema	table_name	row_format	data_length	index_length
 set global innodb_file_per_table = off;
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t3' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t4' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t5' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t5` (errno: 140 "Wrong create options")
 create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t6` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t6' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t6` (errno: 140 "Wrong create options")
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t7` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t7' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t7` (errno: 140 "Wrong create options")
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
 SELECT table_schema, table_name, row_format, data_length, index_length
@@ -333,47 +333,47 @@ drop table t8, t9;
 set global innodb_file_per_table = on;
 set global innodb_file_format = `0`;
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t2' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t3' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t3` (errno: 140 "Wrong create options")
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t4' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t4` (errno: 140 "Wrong create options")
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t5' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t5` (errno: 140 "Wrong create options")
 create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t6` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t6' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t6` (errno: 140 "Wrong create options")
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t7` (errno: 140 "Wrong create options")
 show warnings;
 Level	Code	Message
 Warning	140	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t7' (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t7` (errno: 140 "Wrong create options")
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
 SELECT table_schema, table_name, row_format, data_length, index_length
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index 7307ce9dc24..96ce3d477c9 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -1600,7 +1600,7 @@ concat(a, b)
 drop table t1;
 CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
 SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
-ERROR HY000: The used table type doesn't support FULLTEXT indexes
+ERROR HY000: The storage engine InnoDB doesn't support FULLTEXT indexes
 DROP TABLE t1;
 CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY  (a_id)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 INSERT INTO t1 VALUES (1),(2),(3);
@@ -2525,13 +2525,13 @@ drop table t1;
 set foreign_key_checks=0;
 create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;
 create table t1(a char(10) primary key, b varchar(20)) engine = innodb;
-ERROR HY000: Can't create table 'test.t1' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 set foreign_key_checks=1;
 drop table t2;
 set foreign_key_checks=0;
 create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;
-ERROR HY000: Can't create table 'test.t2' (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 set foreign_key_checks=1;
 drop table t1;
 set foreign_key_checks=0;
diff --git a/mysql-test/suite/innodb/r/innodb_bug12400341.result b/mysql-test/suite/innodb/r/innodb_bug12400341.result
index 02d609d8092..eced0895e3a 100644
--- a/mysql-test/suite/innodb/r/innodb_bug12400341.result
+++ b/mysql-test/suite/innodb/r/innodb_bug12400341.result
@@ -15,7 +15,7 @@ select count(*) from information_schema.processlist;
 count(*)
 33
 CREATE TABLE mysqltest.testtable (id int unsigned not null primary key) ENGINE=InnoDB;
-ERROR HY000: Can't create table 'mysqltest.testtable' (errno: 177 "Too many active concurrent transactions")
+ERROR HY000: Can't create table `mysqltest`.`testtable` (errno: 177 "Too many active concurrent transactions")
 select count(*) from information_schema.processlist;
 count(*)
 33
diff --git a/mysql-test/suite/innodb/r/innodb_bug46000.result b/mysql-test/suite/innodb/r/innodb_bug46000.result
index 9ee0c935d71..f3dff71539b 100644
--- a/mysql-test/suite/innodb/r/innodb_bug46000.result
+++ b/mysql-test/suite/innodb/r/innodb_bug46000.result
@@ -6,7 +6,7 @@ show warnings;
 Level	Code	Message
 Warning	1280	Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index.
 Error	1280	Incorrect index name 'GEN_CLUST_INDEX'
-Error	1005	Can't create table 'test.bug46000' (errno: -1 "Internal error < 0 (Not system error)")
+Error	1005	Can't create table `test`.`bug46000` (errno: -1 "Internal error < 0 (Not system error)")
 create table bug46000(id int) engine=innodb;
 create index GEN_CLUST_INDEX on bug46000(id);
 ERROR 42000: Incorrect index name 'GEN_CLUST_INDEX'
diff --git a/mysql-test/suite/innodb/r/innodb_gis.result b/mysql-test/suite/innodb/r/innodb_gis.result
index 36b37e4ccd8..21c1234d7d3 100644
--- a/mysql-test/suite/innodb/r/innodb_gis.result
+++ b/mysql-test/suite/innodb/r/innodb_gis.result
@@ -598,4 +598,4 @@ create table t1 (a int not null, b linestring not null, unique key b (b(12)));
 create unique index a on t1(a);
 drop table t1;
 create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
-ERROR HY000: The used table type doesn't support SPATIAL indexes
+ERROR HY000: The storage engine InnoDB doesn't support SPATIAL indexes
diff --git a/mysql-test/suite/innodb/t/innodb-create-options.test b/mysql-test/suite/innodb/t/innodb-create-options.test
index 12c24820031..0f8e6f8dda2 100644
--- a/mysql-test/suite/innodb/t/innodb-create-options.test
+++ b/mysql-test/suite/innodb/t/innodb-create-options.test
@@ -96,10 +96,10 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
 
@@ -141,25 +141,25 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 --echo # Test 3) StrictMode=ON, ALTER with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT );
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
@@ -173,26 +173,26 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 KEY_BLOCK_SIZE=2;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 KEY_BLOCK_SIZE=4;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
 SHOW WARNINGS;
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
@@ -213,20 +213,20 @@ CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=2;
 SHOW CREATE TABLE t1;
 ALTER TABLE t1 ADD COLUMN f1 INT;
 SHOW CREATE TABLE t1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
@@ -276,29 +276,29 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 SET GLOBAL innodb_file_format=Barracuda;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_format=Antelope;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ADD COLUMN f1 INT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
@@ -337,20 +337,20 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 KEY_BLOCK_SIZE=1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
 SHOW WARNINGS;
@@ -365,10 +365,10 @@ SET GLOBAL innodb_file_per_table=ON;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_per_table=OFF;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ADD COLUMN f1 INT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ / - .*[0-9]*)/)/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 SHOW WARNINGS;
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index cea9055b873..a8ef524c3e9 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -250,7 +250,7 @@ insert into t2 values (1,1,1,1,1);
 commit;
 alter table t4 add constraint dc foreign key (a) references t1(a);
 show create table t4;
---replace_regex /'test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 # a foreign key 'test/dc' already exists
 --error ER_CANT_CREATE_TABLE
 alter table t3 add constraint dc foreign key (a) references t1(a);
@@ -620,20 +620,20 @@ CREATE TABLE t2(
   PRIMARY KEY (c1)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
---replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1);
---replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
---replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1);
 ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL;
---replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
-- 
cgit v1.2.1