Update test results to fix trivial test failures in parts testsuite

- New error message text
- PARTITION is now a reserved word in SQL, so it should be quoted

mysql-test/suite/federated/federated_server.result

@@ -5,7 +5,7 @@ create database second_db;
 use first_db;
 DROP TABLE IF EXISTS first_db.t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'first_db.t1'
 CREATE TABLE first_db.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -13,7 +13,7 @@ CREATE TABLE first_db.t1 (
 DEFAULT CHARSET=latin1;
 DROP TABLE IF EXISTS first_db.t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'first_db.t2'
 CREATE TABLE first_db.t2 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -22,7 +22,7 @@ DEFAULT CHARSET=latin1;
 use second_db;
 DROP TABLE IF EXISTS second_db.t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'second_db.t1'
 CREATE TABLE second_db.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -30,7 +30,7 @@ CREATE TABLE second_db.t1 (
 DEFAULT CHARSET=latin1;
 DROP TABLE IF EXISTS second_db.t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'second_db.t2'
 CREATE TABLE second_db.t2 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -60,7 +60,7 @@ server_one	127.0.0.1	first_db	root		SLAVE_PORT		mysql	root
 server_two	127.0.0.1	second_db	root		SLAVE_PORT		mysql	root
 DROP TABLE IF EXISTS federated.old;
 Warnings:
-Note	1051	Unknown table 'old'
+Note	1051	Unknown table 'federated.old'
 CREATE TABLE federated.old (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -73,7 +73,7 @@ id	name
 1	federated.old-> first_db.t1, url format
 DROP TABLE IF EXISTS federated.old2;
 Warnings:
-Note	1051	Unknown table 'old2'
+Note	1051	Unknown table 'federated.old2'
 CREATE TABLE federated.old2 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -86,7 +86,7 @@ id	name
 1	federated.old2-> first_db.t2, url format
 DROP TABLE IF EXISTS federated.urldb2t1;
 Warnings:
-Note	1051	Unknown table 'urldb2t1'
+Note	1051	Unknown table 'federated.urldb2t1'
 CREATE TABLE federated.urldb2t1 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -99,7 +99,7 @@ id	name
 1	federated.urldb2t1 -> second_db.t1, url format
 DROP TABLE IF EXISTS federated.urldb2t2;
 Warnings:
-Note	1051	Unknown table 'urldb2t2'
+Note	1051	Unknown table 'federated.urldb2t2'
 CREATE TABLE federated.urldb2t2 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -112,7 +112,7 @@ id	name
 1	federated.urldb2t2 -> second_db.t2, url format
 DROP TABLE IF EXISTS federated.t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'federated.t1'
 CREATE TABLE federated.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''
@@ -126,7 +126,7 @@ id	name
 1	server_one, new scheme, first_db.t1
 DROP TABLE IF EXISTS federated.whatever;
 Warnings:
-Note	1051	Unknown table 'whatever'
+Note	1051	Unknown table 'federated.whatever'
 CREATE TABLE federated.whatever (
 `id` int(20) NOT NULL,
 `name` varchar(64) NOT NULL default ''

mysql-test/suite/maria/max_length.result

 drop table if exists t1,t2;
 Warnings:
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t1'
+Note	1051	Unknown table 'test.t2'
 create table t1 (id int(10) unsigned not null auto_increment primary key, v varchar(1000), b blob) row_format=page max_rows=2 engine=aria;
 create table t2 (id int(10) unsigned not null auto_increment primary key, v varchar(1000), b blob) row_format=page max_rows=20000000 engine=aria;
 lock tables t1 write,t2 write;

mysql-test/suite/oqgraph/r/basic.result

 drop table if exists graph;
 Warnings:
-Note	1051	Unknown table 'graph'
+Note	1051	Unknown table 'test.graph'
 CREATE TABLE graph (
 latch   SMALLINT  UNSIGNED NULL,
 origid  BIGINT    UNSIGNED NULL,

mysql-test/suite/parts/r/partition_alter4_innodb.result

@@ -37566,7 +37566,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -38026,7 +38026,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -38497,7 +38497,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -38969,7 +38969,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -39435,7 +39435,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -39907,7 +39907,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -40384,7 +40384,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -40859,7 +40859,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -41324,7 +41324,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -41784,7 +41784,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -42255,7 +42255,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -42727,7 +42727,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -43193,7 +43193,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -43665,7 +43665,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -44142,7 +44142,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -44617,7 +44617,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -52582,7 +52582,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -53042,7 +53042,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -53513,7 +53513,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -53985,7 +53985,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -54451,7 +54451,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -54923,7 +54923,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -55400,7 +55400,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
@@ -55875,7 +55875,7 @@ SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
 test.t1	optimize	status	OK
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template

mysql-test/suite/parts/r/partition_mgm_lc0_archive.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -237,7 +237,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'Archive'
@@ -268,7 +268,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -493,7 +493,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -724,7 +724,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -237,7 +237,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'InnoDB'
@@ -268,7 +268,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -493,7 +493,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -724,7 +724,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc0_memory.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -237,7 +237,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'Memory'
@@ -268,7 +268,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -493,7 +493,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -724,7 +724,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -237,7 +237,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'MyISAM'
@@ -268,7 +268,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -493,7 +493,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -724,7 +724,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc1_archive.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -228,7 +228,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'Archive'
@@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -475,7 +475,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -698,7 +698,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -228,7 +228,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'InnoDB'
@@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -475,7 +475,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -698,7 +698,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc1_memory.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -228,7 +228,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'Memory'
@@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -475,7 +475,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -698,7 +698,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result

@@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -228,7 +228,7 @@ PARTITION BY HASH (a)
 PARTITION partA ,
 PARTITION Parta ,
 PARTITION PartA );
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 # Creating Hash partitioned table
 CREATE TABLE TableA (a INT)
 ENGINE = 'MyISAM'
@@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
 (PARTITION partA,
 PARTITION Parta,
 PARTITION PartA);
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE,
 PARTITION Partf,
@@ -475,7 +475,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES LESS THAN (MAXVALUE));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES LESS THAN (16),
 PARTITION Partf VALUES LESS THAN (19),
@@ -698,7 +698,7 @@ a
 # expecting duplicate partition name
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partA VALUES IN (0));
-ERROR HY000: Duplicate partition name parta
+ERROR HY000: Duplicate partition name partA
 ALTER TABLE TableA ADD PARTITION
 (PARTITION partE VALUES IN (16),
 PARTITION Partf VALUES IN (19),

mysql-test/suite/parts/r/partition_repair_myisam.result

@@ -209,7 +209,7 @@ PARTITIONS 7;
 SELECT COUNT(*) FROM t1_will_crash;
 COUNT(*)
 33
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
 partition	rows
 0	2
 1	5
@@ -218,7 +218,7 @@ partition	rows
 4	4
 5	4
 6	8
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 partition	b	a	length(c)
 0	0	 lost	64
 0	7	z lost	64
@@ -282,7 +282,7 @@ test.t1_will_crash	repair	status	OK
 SELECT COUNT(*) FROM t1_will_crash;
 COUNT(*)
 29
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
 partition	rows
 1	4
 2	5
@@ -290,7 +290,7 @@ partition	rows
 4	4
 5	4
 6	7
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 partition	b	a	length(c)
 1	1	abc	64
 1	8	tuw	64
@@ -366,9 +366,9 @@ Table	Op	Msg_type	Msg_text
 test.t1_will_crash	repair	info	Delete link points outside datafile at 340
 test.t1_will_crash	repair	info	Delete link points outside datafile at 340
 test.t1_will_crash	repair	status	OK
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 partition	b	a	length(c)
 6	6	jkl	64
 6	13	ooo	64
@@ -385,9 +385,9 @@ FLUSH TABLES;
 # table, depending if one reads via index or direct on datafile.
 # Since crash when reuse of deleted row space, CHECK MEDIUM or EXTENDED
 # is required (MEDIUM is default) to verify correct behavior!
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 partition	b	a	length(c)
 6	6	jkl	64
 6	13	ooo	64
@@ -396,9 +396,9 @@ partition	b	a	length(c)
 6	97	zzzzzZzzzzz	64
 SET @save_optimizer_switch= @@optimizer_switch;
 SET @@optimizer_switch='derived_merge=off';
-SELECT (b % 7) AS partition, b, a FROM (SELECT b,a FROM t1_will_crash) q
+SELECT (b % 7) AS `partition`, b, a FROM (SELECT b,a FROM t1_will_crash) q
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 partition	b	a
 6	6	jkl
 6	13	ooo
@@ -422,7 +422,7 @@ test.t1_will_crash	repair	status	OK
 SELECT COUNT(*) FROM t1_will_crash;
 COUNT(*)
 29
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
 partition	rows
 1	4
 2	4
@@ -430,7 +430,7 @@ partition	rows
 4	4
 5	4
 6	8
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 partition	b	a	length(c)
 1	1	abc	64
 1	8	tuw	64

mysql-test/suite/parts/t/partition_repair_myisam.test

@@ -151,8 +151,8 @@ eval INSERT INTO t1_will_crash VALUES
   ('6 row 7 (crash before completely written to datafile)', 27, '$lt$lt');
 --enable_query_log
 SELECT COUNT(*) FROM t1_will_crash;
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 FLUSH TABLES;
 # testing p0, p1, p3, p6(1)
 --echo # truncating p0 to simulate an empty datafile (not recovered!)
@@ -177,8 +177,8 @@ OPTIMIZE TABLE t1_will_crash;
 CHECK TABLE t1_will_crash;
 REPAIR TABLE t1_will_crash;
 SELECT COUNT(*) FROM t1_will_crash;
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 FLUSH TABLES;
 
 # testing p2, p4, p6(2, 3)
@@ -215,9 +215,9 @@ FLUSH TABLES;
 #ALTER TABLE t1_will_crash OPTIMIZE PARTITION p6;
 ALTER TABLE t1_will_crash CHECK PARTITION p6;
 ALTER TABLE t1_will_crash REPAIR PARTITION p6;
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 FLUSH TABLES;
 
 --echo #
@@ -229,21 +229,21 @@ FLUSH TABLES;
 --echo # table, depending if one reads via index or direct on datafile.
 --echo # Since crash when reuse of deleted row space, CHECK MEDIUM or EXTENDED
 --echo # is required (MEDIUM is default) to verify correct behavior!
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 SET @save_optimizer_switch= @@optimizer_switch;
 SET @@optimizer_switch='derived_merge=off';
-SELECT (b % 7) AS partition, b, a FROM (SELECT b,a FROM t1_will_crash) q
+SELECT (b % 7) AS `partition`, b, a FROM (SELECT b,a FROM t1_will_crash) q
 WHERE (b % 7) = 6
-ORDER BY partition, b, a;
+ORDER BY `partition`, b, a;
 SET @@optimizer_switch=@save_optimizer_switch;
 # NOTE: REBUILD PARTITION without CHECK before, 2 + (1) records will be lost!
 #ALTER TABLE t1_will_crash REBUILD PARTITION p6;
 ALTER TABLE t1_will_crash CHECK PARTITION p6;
 ALTER TABLE t1_will_crash REPAIR PARTITION p6;
 SELECT COUNT(*) FROM t1_will_crash;
-SELECT (b % 7) AS partition, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
-SELECT (b % 7) AS partition, b, a, length(c) FROM t1_will_crash ORDER BY partition, b, a;
+SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
+SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
 ALTER TABLE t1_will_crash CHECK PARTITION all EXTENDED;
 DROP TABLE t1_will_crash;

mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result

@@ -20,35 +20,35 @@ CREATE TEMPORARY TABLE nt_tmp_xx_1 ( id INT ) ENGINE = MyIsam;
 CREATE TEMPORARY TABLE tt_tmp_xx_1 ( id INT ) ENGINE = Innodb;
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
 Warnings:
-Note	1051	Unknown table 'nt_tmp_2'
+Note	1051	Unknown table 'test.nt_tmp_2'
 CREATE TEMPORARY TABLE nt_tmp_2 ( id INT ) ENGINE = MyIsam;
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
 Warnings:
-Note	1051	Unknown table 'nt_tmp_1'
+Note	1051	Unknown table 'test.nt_tmp_1'
 CREATE TEMPORARY TABLE nt_tmp_1 ( id INT ) ENGINE = MyIsam;
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
 Warnings:
-Note	1051	Unknown table 'tt_tmp_2'
+Note	1051	Unknown table 'test.tt_tmp_2'
 CREATE TEMPORARY TABLE tt_tmp_2 ( id INT ) ENGINE = Innodb;
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
 Warnings:
-Note	1051	Unknown table 'tt_tmp_1'
+Note	1051	Unknown table 'test.tt_tmp_1'
 CREATE TEMPORARY TABLE tt_tmp_1 ( id INT ) ENGINE = Innodb;
 DROP TABLE IF EXISTS nt_2;
 Warnings:
-Note	1051	Unknown table 'nt_2'
+Note	1051	Unknown table 'test.nt_2'
 CREATE TABLE nt_2 ( id INT ) ENGINE = MyIsam;
 DROP TABLE IF EXISTS nt_1;
 Warnings:
-Note	1051	Unknown table 'nt_1'
+Note	1051	Unknown table 'test.nt_1'
 CREATE TABLE nt_1 ( id INT ) ENGINE = MyIsam;
 DROP TABLE IF EXISTS tt_2;
 Warnings:
-Note	1051	Unknown table 'tt_2'
+Note	1051	Unknown table 'test.tt_2'
 CREATE TABLE tt_2 ( id INT ) ENGINE = Innodb;
 DROP TABLE IF EXISTS tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 CREATE TABLE tt_1 ( id INT ) ENGINE = Innodb;
 SET @commands= '';
 #########################################################################
@@ -76,7 +76,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* gen
 
 SET @commands= 'Drop-Temp-Xe-Temp';
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-Xe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-Xe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
@@ -84,7 +84,7 @@ include/show_binlog_events.inc
 SET @commands= 'Drop-Temp-If-Xe-Temp';
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-Xe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -93,7 +93,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_xx_
 
 SET @commands= 'Drop-Temp-TXe-Temp';
 DROP TEMPORARY TABLE tt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-TXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -103,7 +103,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* gen
 SET @commands= 'Drop-Temp-If-TXe-Temp';
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-TXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -112,7 +112,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp
 
 SET @commands= 'Drop-Temp-NXe-Temp';
 DROP TEMPORARY TABLE nt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -122,7 +122,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* gen
 SET @commands= 'Drop-Temp-If-NXe-Temp';
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -237,7 +237,7 @@ SET @commands= 'B T Drop-Temp-Xe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -251,10 +251,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -272,7 +272,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -288,11 +288,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -311,7 +311,7 @@ SET @commands= 'B T Drop-Temp-TXe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -326,10 +326,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_1, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -349,7 +349,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -365,11 +365,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_1, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -388,7 +388,7 @@ SET @commands= 'B T Drop-Temp-NXe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -405,10 +405,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_1, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -432,7 +432,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -451,11 +451,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_1, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 COMMIT;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -745,7 +745,7 @@ SET @commands= 'B T Drop-Temp-Xe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -759,10 +759,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_xx_1;
-ERROR 42S02: Unknown table 'tt_xx_1'
+ERROR 42S02: Unknown table 'test.tt_xx_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -782,7 +782,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -798,11 +798,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_xx_1;
 Warnings:
-Note	1051	Unknown table 'tt_xx_1'
+Note	1051	Unknown table 'test.tt_xx_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -823,7 +823,7 @@ SET @commands= 'B T Drop-Temp-TXe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -838,10 +838,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE tt_tmp_1, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -863,7 +863,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -879,11 +879,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS tt_tmp_1, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -904,7 +904,7 @@ SET @commands= 'B T Drop-Temp-NXe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -921,10 +921,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp R';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_2, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE nt_tmp_1, tt_1;
-ERROR 42S02: Unknown table 'tt_1'
+ERROR 42S02: Unknown table 'test.tt_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -950,7 +950,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 ROLLBACK;
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
@@ -969,11 +969,11 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 INSERT INTO nt_xx_1() VALUES (1);
 DROP TEMPORARY TABLE IF EXISTS nt_tmp_1, tt_1;
 Warnings:
-Note	1051	Unknown table 'tt_1'
+Note	1051	Unknown table 'test.tt_1'
 ROLLBACK;
 Warnings:
 Warning	#	Some non-transactional changed tables couldn't be rolled back
@@ -1216,7 +1216,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2` /* generated by serv
 
 SET @commands= 'Drop-Xe';
 DROP TABLE xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Xe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Xe << -e-e-e-e-e-e-e-e-e-e-e-
@@ -1224,7 +1224,7 @@ include/show_binlog_events.inc
 SET @commands= 'Drop-If-Xe';
 DROP TABLE IF EXISTS xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-Xe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1233,7 +1233,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `xx_1` /* generat
 
 SET @commands= 'Drop-TXe';
 DROP TABLE tt_2, xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-TXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1243,7 +1243,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `tt_2`,`xx_1` /* generated
 SET @commands= 'Drop-If-TXe';
 DROP TABLE IF EXISTS tt_2, xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-TXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1252,7 +1252,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `tt_2`,`xx_1` /*
 
 SET @commands= 'Drop-NXe';
 DROP TABLE nt_2, xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-NXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1262,7 +1262,7 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2`,`xx_1` /* generated
 SET @commands= 'Drop-If-NXe';
 DROP TABLE IF EXISTS nt_2, xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-NXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1346,7 +1346,7 @@ SET @commands= 'B T Drop-Xe';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Xe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1360,7 +1360,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE IF EXISTS xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-Xe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1374,7 +1374,7 @@ SET @commands= 'B T Drop-TXe';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE tt_2, xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-TXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1389,7 +1389,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE IF EXISTS tt_2, xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-TXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1403,7 +1403,7 @@ SET @commands= 'B T Drop-NXe';
 BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE nt_2, xx_1;
-ERROR 42S02: Unknown table 'xx_1'
+ERROR 42S02: Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-NXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -1418,7 +1418,7 @@ BEGIN;
 INSERT INTO tt_xx_1() VALUES (1);
 DROP TABLE IF EXISTS nt_2, xx_1;
 Warnings:
-Note	1051	Unknown table 'xx_1'
+Note	1051	Unknown table 'test.xx_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-NXe << -b-b-b-b-b-b-b-b-b-b-b-
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info