List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:August 30 2010 6:38am
Subject:bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3260) Bug#34750
View as plain text  
#At file:///export/home/jl208045/mysql/mysql-next-mr-bugfixing-34750/ based on revid:alik@strippedp304md46srzqdto

 3260 Jorgen Loland	2010-08-30
      Bug#34750: Print database name in Unknown Table error message
      
      Feature request to print database name in 
      "Unknown table '<table>'" comment.
      
      The patch prints the database name in error message 
      ER_BAD_TABLE_ERROR (if available).
     @ mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/include/mtr_warnings.sql
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/alter_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/bootstrap.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/create.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/csv.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_errors.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_tis620.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_ujis.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_utf8.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_utf8mb4.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_utf8mb4_heap.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_utf8mb4_innodb.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ctype_utf8mb4_myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/drop.result
        Added test for BUG#34750
     @ mysql-test/r/error_simulation.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/gis-rtree.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/grant.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/handler_innodb.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/handler_myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/key.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/log_tables.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/mdl_sync.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/myisam-system.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/mysqldump.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/partition.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/partition_disabled.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/partition_error.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/profiling.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ps.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ps_1general.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/ps_ddl1.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/read_only.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/rename.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/signal.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/signal_demo2.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/signal_demo3.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/sp-dynamic.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/sp-error.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/sp-prelocking.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/sp-vars.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/sp.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/temp_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/truncate_coverage.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/type_newdecimal.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/view.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/r/warnings.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/innodb/r/innodb-autoinc.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/innodb/r/innodb.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/innodb/r/innodb_mysql.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl000013.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_drop.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_drop_temp.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_drop_view.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_multi_update3.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_row_colSize.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_session_var.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_stm_no_op.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_stm_until.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/rpl/r/rpl_temp_table.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/sys_vars/r/slow_query_log_func.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/suite/sys_vars/r/sql_notes_func.result
        Updated warning output for drop view/drop table: database name is now printed.
     @ mysql-test/t/drop.test
        Added test for BUG#34750
     @ sql/sql_admin.cc
        Print database name in ER_BAD_TABLE_ERROR
     @ sql/sql_base.cc
        Print database name in ER_BAD_TABLE_ERROR
     @ sql/sql_table.cc
        Print database name in ER_BAD_TABLE_ERROR
     @ sql/sql_view.cc
        Print database name in ER_BAD_TABLE_ERROR

    modified:
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
      mysql-test/include/mtr_warnings.sql
      mysql-test/r/alter_table.result
      mysql-test/r/bootstrap.result
      mysql-test/r/create.result
      mysql-test/r/csv.result
      mysql-test/r/ctype_errors.result
      mysql-test/r/ctype_tis620.result
      mysql-test/r/ctype_ujis.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/ctype_utf8mb4_heap.result
      mysql-test/r/ctype_utf8mb4_innodb.result
      mysql-test/r/ctype_utf8mb4_myisam.result
      mysql-test/r/drop.result
      mysql-test/r/error_simulation.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/grant.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/key.result
      mysql-test/r/log_tables.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/myisam-system.result
      mysql-test/r/myisam.result
      mysql-test/r/mysqldump.result
      mysql-test/r/partition.result
      mysql-test/r/partition_disabled.result
      mysql-test/r/partition_error.result
      mysql-test/r/profiling.result
      mysql-test/r/ps.result
      mysql-test/r/ps_1general.result
      mysql-test/r/ps_ddl1.result
      mysql-test/r/read_only.result
      mysql-test/r/rename.result
      mysql-test/r/signal.result
      mysql-test/r/signal_demo2.result
      mysql-test/r/signal_demo3.result
      mysql-test/r/sp-dynamic.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-prelocking.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/temp_table.result
      mysql-test/r/truncate_coverage.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/view.result
      mysql-test/r/warnings.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/rpl/r/rpl000013.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_drop_view.result
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/sys_vars/r/slow_query_log_func.result
      mysql-test/suite/sys_vars/r/sql_notes_func.result
      mysql-test/t/drop.test
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_table.cc
      sql/sql_view.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test'
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-07-12 11:55:16 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-08-30 06:38:09 +0000
@@ -22,7 +22,7 @@ DROP TABLE IF EXISTS t1, t2,t3,t4,t5,t6,
 #          should stop the slave.               #
 #################################################
 
-call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 
 --echo **** Diff Table Def Start ****
 

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2010-08-04 12:38:29 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2010-08-30 06:38:09 +0000
@@ -178,7 +178,7 @@ INSERT INTO global_suppressions VALUES
       this error message.
   */
  ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"),
- ("Slave: Unknown table 't1' Error_code: 1051"),
+ ("Slave: Unknown table 'test.t1' Error_code: 1051"),
 
  /* Added 2009-08-XX after fixing Bug #42408 */
 
@@ -189,7 +189,7 @@ INSERT INTO global_suppressions VALUES
  ("The path specified for the variable .* is not a directory or cannot be written:"),
  ("Master server does not support or not configured semi-sync replication, fallback to asynchronous"),
  (": The MySQL server is running with the --secure-backup-file-priv option so it cannot execute this statement"),
- ("Slave: Unknown table 't1' Error_code: 1051"),
+ ("Slave: Unknown table 'test.t1' Error_code: 1051"),
 
  /* Messages from valgrind */
  ("==[0-9]*== Memcheck,"),

=== modified file 'mysql-test/r/alter_table.result'
--- a/mysql-test/r/alter_table.result	2010-07-26 09:22:38 +0000
+++ b/mysql-test/r/alter_table.result	2010-08-30 06:38:09 +0000
@@ -380,8 +380,8 @@ ERROR 42000: Incorrect table name ''
 drop table t1;
 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 ( a varchar(10) not null primary key ) engine=myisam;
 create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);
 flush tables;
@@ -666,7 +666,7 @@ create database mysqltest;
 create table t1 (c1 int);
 alter table t1 rename mysqltest.t1;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 alter table mysqltest.t1 rename t1;
 drop table t1;
 create table t1 (c1 int);

=== modified file 'mysql-test/r/bootstrap.result'
--- a/mysql-test/r/bootstrap.result	2007-02-20 11:48:15 +0000
+++ b/mysql-test/r/bootstrap.result	2010-08-30 06:38:09 +0000
@@ -1,7 +1,7 @@
 drop table if exists t1;
 drop table t1;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 set @my_max_allowed_packet= @@max_allowed_packet;
 set global max_allowed_packet=100*@@max_allowed_packet;
 set global max_allowed_packet=@my_max_allowed_packet;

=== modified file 'mysql-test/r/create.result'
--- a/mysql-test/r/create.result	2010-08-26 21:32:48 +0000
+++ b/mysql-test/r/create.result	2010-08-30 06:38:09 +0000
@@ -28,15 +28,15 @@ create table t2 select auto+1 from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 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 (b char(0) not null, index(b));
 ERROR 42000: The used storage engine can't index column 'b'
 create table t1 (a int not null,b text) engine=heap;
 ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;
 ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key
 create table not_existing_database.test (a int);
@@ -157,17 +157,17 @@ create table t2 (a int, a float) select 
 ERROR 42S21: Duplicate column name 'a'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 create table t2 (a int) select a as b, a+1 as b from t1;
 ERROR 42S21: Duplicate column name 'b'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 create table t2 (b int) select a as b, a+1 as b from t1;
 ERROR 42S21: Duplicate column name 'b'
 drop table if exists t1,t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t1 (a int not null);
 INSERT INTO t1 values (1),(2),(1);
 CREATE TABLE t2 (primary key(a)) SELECT * FROM t1;
@@ -177,7 +177,7 @@ ERROR 42S02: Table 'test.t2' doesn't exi
 DROP TABLE t1;
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 create table t1 (a int not null, b int, primary key(a), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b));
 show create table t1;
 Table	Create Table
@@ -1593,12 +1593,12 @@ CREATE TABLE t2 (primary key (a)) select
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t2 (a int, b int, primary key (a));
 INSERT INTO t2 select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'

=== modified file 'mysql-test/r/csv.result'
--- a/mysql-test/r/csv.result	2010-08-16 07:30:40 +0000
+++ b/mysql-test/r/csv.result	2010-08-30 06:38:09 +0000
@@ -4925,9 +4925,9 @@ period
 9410
 drop table if exists t1,t2,t3,t4;
 Warnings:
-Note	1051	Unknown table 't2'
-Note	1051	Unknown table 't3'
-Note	1051	Unknown table 't4'
+Note	1051	Unknown table 'test.t2'
+Note	1051	Unknown table 'test.t3'
+Note	1051	Unknown table 'test.t4'
 DROP TABLE IF EXISTS bug13894;
 CREATE TABLE bug13894 ( val integer not null ) ENGINE = CSV;
 INSERT INTO bug13894 VALUES (5);

=== modified file 'mysql-test/r/ctype_errors.result'
--- a/mysql-test/r/ctype_errors.result	2009-10-15 12:23:43 +0000
+++ b/mysql-test/r/ctype_errors.result	2010-08-30 06:38:09 +0000
@@ -24,7 +24,7 @@ lc_messages	ru_RU
 SET GLOBAL lc_messages=en_US;
 DROP TABLE t1;
 drop table `ק`;
-ERROR 42S02: Unknown table 'ק'
+ERROR 42S02: Unknown table 'test.ק'
 SET lc_messages=cs_CZ;
 SET NAMES UTF8;
 USE nonexistant;

=== modified file 'mysql-test/r/ctype_tis620.result'
--- a/mysql-test/r/ctype_tis620.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_tis620.result	2010-08-30 06:38:09 +0000
@@ -138,7 +138,7 @@ year
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1
 (
 name varchar(50) NOT NULL default '',

=== modified file 'mysql-test/r/ctype_ujis.result'
--- a/mysql-test/r/ctype_ujis.result	2010-03-22 09:13:41 +0000
+++ b/mysql-test/r/ctype_ujis.result	2010-08-30 06:38:09 +0000
@@ -94,7 +94,7 @@ select @ujis4 = CONVERT(@utf84 USING uji
 1
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 create table t1 (c1 varchar(8)) default character set 'ujis';
 insert into t1 values (0xA4A2),(0xA2A2),(0xA4A2);
 select c1 as 'no index' from t1 where c1 like cast(concat(0xA4A2, '%') as char character set ujis);
@@ -168,7 +168,7 @@ a	b
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(c char(1)) character set ujis;
 INSERT INTO t1 VALUES(0xA2AF);
 INSERT INTO t1 VALUES(0xA2B0);

=== modified file 'mysql-test/r/ctype_utf8.result'
--- a/mysql-test/r/ctype_utf8.result	2010-08-19 12:54:22 +0000
+++ b/mysql-test/r/ctype_utf8.result	2010-08-30 06:38:09 +0000
@@ -1282,7 +1282,7 @@ DROP TABLE t1;
 SET NAMES utf8;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
 INSERT INTO t1 VALUES('uu');

=== modified file 'mysql-test/r/ctype_utf8mb4.result'
--- a/mysql-test/r/ctype_utf8mb4.result	2010-06-25 11:42:42 +0000
+++ b/mysql-test/r/ctype_utf8mb4.result	2010-08-30 06:38:09 +0000
@@ -1287,7 +1287,7 @@ DROP TABLE t1;
 SET NAMES utf8mb4;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1000 bytes

=== modified file 'mysql-test/r/ctype_utf8mb4_heap.result'
--- a/mysql-test/r/ctype_utf8mb4_heap.result	2010-06-25 11:42:42 +0000
+++ b/mysql-test/r/ctype_utf8mb4_heap.result	2010-08-30 06:38:09 +0000
@@ -1216,7 +1216,7 @@ DROP TABLE t1;
 SET NAMES utf8mb4;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=heap DEFAULT CHARSET=utf8mb4;
 INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
 INSERT INTO t1 VALUES('uu');

=== modified file 'mysql-test/r/ctype_utf8mb4_innodb.result'
--- a/mysql-test/r/ctype_utf8mb4_innodb.result	2010-06-25 11:42:42 +0000
+++ b/mysql-test/r/ctype_utf8mb4_innodb.result	2010-08-30 06:38:09 +0000
@@ -1287,7 +1287,7 @@ DROP TABLE t1;
 SET NAMES utf8mb4;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 Warnings:
 Warning	1071	Specified key was too long; max key length is 767 bytes

=== modified file 'mysql-test/r/ctype_utf8mb4_myisam.result'
--- a/mysql-test/r/ctype_utf8mb4_myisam.result	2010-06-25 11:42:42 +0000
+++ b/mysql-test/r/ctype_utf8mb4_myisam.result	2010-08-30 06:38:09 +0000
@@ -1287,7 +1287,7 @@ DROP TABLE t1;
 SET NAMES utf8mb4;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1000 bytes

=== modified file 'mysql-test/r/drop.result'
--- a/mysql-test/r/drop.result	2010-06-07 15:27:40 +0000
+++ b/mysql-test/r/drop.result	2010-08-30 06:38:09 +0000
@@ -2,7 +2,7 @@ drop table if exists t1;
 drop database if exists mysqltest;
 drop database if exists client_test_db;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 create table t1(n int);
 insert into t1 values(1);
 create temporary table t1( n int);
@@ -30,13 +30,13 @@ table7, table8, table9, table10, table11
 table14, table15, table16, table17, table18, table19, table20,
 table21, table22, table23, table24, table25, table26, table27,
 table28;
-ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table'
+ERROR 42S02: Unknown table 'mysqltest.table1,mysqltest.table2,mysqltest.table3,mysqltest.table4,mysqltest.table5,mysqltest.table'
 drop table table1, table2, table3, table4, table5, table6,
 table7, table8, table9, table10, table11, table12, table13,
 table14, table15, table16, table17, table18, table19, table20,
 table21, table22, table23, table24, table25, table26, table27,
 table28, table29, table30;
-ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table'
+ERROR 42S02: Unknown table 'mysqltest.table1,mysqltest.table2,mysqltest.table3,mysqltest.table4,mysqltest.table5,mysqltest.table'
 use test;
 drop database mysqltest;
 flush tables with read lock;
@@ -149,10 +149,10 @@ End of 5.1 tests
 # --
 DROP TABLE IF EXISTS t1;
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 SHOW WARNINGS;
 Level	Code	Message
-Error	1051	Unknown table 't1'
+Error	1051	Unknown table 'test.t1'
 
 # --
 # -- End of Bug#37431.
@@ -167,3 +167,39 @@ DROP TABLE t1, t1;
 ERROR 42000: Not unique table/alias: 't1'
 UNLOCK TABLES;
 DROP TABLE t1;
+#
+# BUG#34750: Print database name in Unknown Table error message
+#
+
+# Test error message when droping table/view
+DROP TABLE table1;
+ERROR 42S02: Unknown table 'test.table1'
+DROP TABLE table1,table2;
+ERROR 42S02: Unknown table 'test.table1,test.table2'
+DROP VIEW view1,view2,view3,view4;
+ERROR 42S02: Unknown table 'test.view1,test.view2,test.view3,test.view4'
+
+DROP TABLE IF EXISTS table1;
+Warnings:
+Note	1051	Unknown table 'test.table1'
+DROP TABLE IF EXISTS table1,table2;
+Warnings:
+Note	1051	Unknown table 'test.table1'
+Note	1051	Unknown table 'test.table2'
+DROP VIEW IF EXISTS view1,view2,view3,view4;
+Warnings:
+Note	1051	Unknown table 'test.view1'
+Note	1051	Unknown table 'test.view2'
+Note	1051	Unknown table 'test.view3'
+Note	1051	Unknown table 'test.view4'
+
+# Test error message when trigger does not find table
+CREATE TABLE table1(a int);
+CREATE TABLE table2(b int);
+CREATE TRIGGER trg1 AFTER INSERT ON table1
+FOR EACH ROW
+INSERT INTO table2 SELECT t.notable.*;
+INSERT INTO table1 VALUES (1);
+ERROR 42S02: Unknown table 't.notable'
+DROP TABLE table1,table2;
+# End BUG#34750

=== modified file 'mysql-test/r/error_simulation.result'
--- a/mysql-test/r/error_simulation.result	2010-06-24 13:21:23 +0000
+++ b/mysql-test/r/error_simulation.result	2010-08-30 06:38:09 +0000
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (
 a varchar(32) character set utf8 collate utf8_bin NOT NULL,
 b varchar(32) character set utf8 collate utf8_bin NOT NULL )

=== modified file 'mysql-test/r/gis-rtree.result'
--- a/mysql-test/r/gis-rtree.result	2010-03-25 11:49:01 +0000
+++ b/mysql-test/r/gis-rtree.result	2010-08-30 06:38:09 +0000
@@ -712,7 +712,7 @@ count(*)
 DROP TABLE t2;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (a geometry NOT NULL, SPATIAL (a));
 INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)"));
 INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)"));

=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2010-08-05 13:10:22 +0000
+++ b/mysql-test/r/grant.result	2010-08-30 06:38:09 +0000
@@ -1228,7 +1228,7 @@ FLUSH PRIVILEGES;
 DROP TABLE mysql.user;
 drop table if exists test;
 Warnings:
-Note	1051	Unknown table 'test'
+Note	1051	Unknown table 'test.test'
 drop function if exists test_function;
 Warnings:
 Note	1305	FUNCTION test.test_function does not exist

=== modified file 'mysql-test/r/handler_innodb.result'
--- a/mysql-test/r/handler_innodb.result	2010-07-05 11:59:34 +0000
+++ b/mysql-test/r/handler_innodb.result	2010-08-30 06:38:09 +0000
@@ -515,7 +515,7 @@ select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 drop table if exists t1;
 create table t1 (a int) ENGINE=MEMORY;
 --> client 2

=== modified file 'mysql-test/r/handler_myisam.result'
--- a/mysql-test/r/handler_myisam.result	2010-07-05 11:59:34 +0000
+++ b/mysql-test/r/handler_myisam.result	2010-08-30 06:38:09 +0000
@@ -514,7 +514,7 @@ select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 drop table if exists t1;
 create table t1 (a int) ENGINE=MEMORY;
 --> client 2

=== modified file 'mysql-test/r/key.result'
--- a/mysql-test/r/key.result	2010-07-13 17:29:44 +0000
+++ b/mysql-test/r/key.result	2010-08-30 06:38:09 +0000
@@ -273,7 +273,7 @@ t
 drop table t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (
 c1 int,
 c2 varbinary(240),

=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result	2009-12-22 11:02:52 +0000
+++ b/mysql-test/r/log_tables.result	2010-08-30 06:38:09 +0000
@@ -256,9 +256,9 @@ set storage_engine= @save_storage_engine
 drop table mysql.slow_log;
 drop table mysql.general_log;
 drop table mysql.general_log;
-ERROR 42S02: Unknown table 'general_log'
+ERROR 42S02: Unknown table 'mysql.general_log'
 drop table mysql.slow_log;
-ERROR 42S02: Unknown table 'slow_log'
+ERROR 42S02: Unknown table 'mysql.slow_log'
 use mysql;
 CREATE TABLE `general_log` (
 `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP

=== modified file 'mysql-test/r/mdl_sync.result'
--- a/mysql-test/r/mdl_sync.result	2010-08-12 13:50:23 +0000
+++ b/mysql-test/r/mdl_sync.result	2010-08-30 06:38:09 +0000
@@ -16,7 +16,7 @@ connection: con1
 connection: default
 unlock tables;
 connection: con2
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 drop table t3;
 SET DEBUG_SYNC= 'RESET';
 #
@@ -2878,7 +2878,7 @@ SET DEBUG_SYNC= 'now SIGNAL blocked';
 # Reaping: DROP DATABASE db1
 # Connection con2
 # Reaping: DROP TABLE db1.t1
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'db1.t1'
 # Connection default
 SET DEBUG_SYNC= 'RESET';
 #

=== modified file 'mysql-test/r/myisam-system.result'
--- a/mysql-test/r/myisam-system.result	2009-09-10 09:18:29 +0000
+++ b/mysql-test/r/myisam-system.result	2010-08-30 06:38:09 +0000
@@ -10,4 +10,4 @@ create table t1 (a int) engine=myisam;
 drop table t1;
 Got one of the listed errors
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'

=== modified file 'mysql-test/r/myisam.result'
--- a/mysql-test/r/myisam.result	2010-07-06 20:37:12 +0000
+++ b/mysql-test/r/myisam.result	2010-08-30 06:38:09 +0000
@@ -430,7 +430,7 @@ a	b	c
 drop table t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a));
 INSERT t1 VALUES ("can \tcan");
 INSERT t1 VALUES ("can   can");

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2010-07-05 11:57:49 +0000
+++ b/mysql-test/r/mysqldump.result	2010-08-30 06:38:09 +0000
@@ -2613,13 +2613,13 @@ DROP TABLE t1, t2;
 #
 DROP TABLE IF EXISTS `test1`;
 Warnings:
-Note	1051	Unknown table 'test1'
+Note	1051	Unknown table 'test.test1'
 CREATE TABLE `test1` (
 `a1` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 DROP TABLE IF EXISTS `test2`;
 Warnings:
-Note	1051	Unknown table 'test2'
+Note	1051	Unknown table 'test.test2'
 CREATE TABLE `test2` (
 `a2` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2010-08-26 21:32:48 +0000
+++ b/mysql-test/r/partition.result	2010-08-30 06:38:09 +0000
@@ -1742,7 +1742,7 @@ INSERT INTO t1 VALUES
 ('2006-09-29 21:50:01',22589,'Verified');
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t2 (
 id int(8) NOT NULL,
 severity tinyint(4) NOT NULL DEFAULT '0',

=== modified file 'mysql-test/r/partition_disabled.result'
--- a/mysql-test/r/partition_disabled.result	2010-08-16 12:53:30 +0000
+++ b/mysql-test/r/partition_disabled.result	2010-08-30 06:38:09 +0000
@@ -56,7 +56,7 @@ ERROR HY000: The MySQL server is running
 ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
 ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 CREATE TABLE t1 (
 firstname VARCHAR(25) NOT NULL,
 lastname VARCHAR(25) NOT NULL,
@@ -73,7 +73,7 @@ PARTITION p4 VALUES LESS THAN MAXVALUE
 );
 ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 CREATE TABLE t1 (id INT, purchased DATE)
 PARTITION BY RANGE( YEAR(purchased) )
 SUBPARTITION BY HASH( TO_DAYS(purchased) )
@@ -84,7 +84,7 @@ PARTITION p2 VALUES LESS THAN MAXVALUE
 );
 ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 create table t1 (a varchar(10) charset latin1 collate latin1_bin);
 insert into t1 values (''),(' '),('a'),('a '),('a  ');
 explain partitions select * from t1 where a='a ' OR a='a';

=== modified file 'mysql-test/r/partition_error.result'
--- a/mysql-test/r/partition_error.result	2010-06-17 10:37:03 +0000
+++ b/mysql-test/r/partition_error.result	2010-08-30 06:38:09 +0000
@@ -14,7 +14,7 @@ ERROR HY000: Failed to read from the .pa
 # Note that it is currently impossible to drop a partitioned table
 # without the .par file
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 #
 # Bug#49477: Assertion `0' failed in ha_partition.cc:5530
 # with temporary table and partitions

=== modified file 'mysql-test/r/profiling.result'
--- a/mysql-test/r/profiling.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/r/profiling.result	2010-08-30 06:38:09 +0000
@@ -123,8 +123,8 @@ select query_id, count(*), sum(duration)
 select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling;
 drop table if exists t1, t2, t3;
 Warnings:
-Note	1051	Unknown table 't2'
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t2'
+Note	1051	Unknown table 'test.t3'
 create table t1 (id int );
 create table t2 (id int not null);
 create table t3 (id int not null primary key);
@@ -309,7 +309,7 @@ select @@profiling;
 set session profiling = OFF;
 drop table if exists profile_log;
 Warnings:
-Note	1051	Unknown table 'profile_log'
+Note	1051	Unknown table 'test.profile_log'
 create table profile_log (how_many int);
 drop procedure if exists p1;
 drop procedure if exists p2;

=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2010-08-05 12:53:09 +0000
+++ b/mysql-test/r/ps.result	2010-08-30 06:38:09 +0000
@@ -50,7 +50,7 @@ execute stmt4;
 prepare stmt4 from 'drop table t2';
 execute stmt4;
 execute stmt4;
-ERROR 42S02: Unknown table 't2'
+ERROR 42S02: Unknown table 'test.t2'
 prepare stmt5 from 'select ? + a from t1';
 set @a=1;
 execute stmt5 using @a;
@@ -519,7 +519,7 @@ FOUND_ROWS()
 deallocate prepare stmt;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 create table t1 (c1 int(11) not null, c2 int(11) not null,
 primary key  (c1,c2), key c2 (c2), key c1 (c1));
 insert into t1 values (200887, 860);
@@ -2792,48 +2792,48 @@ drop table if exists t2;
 create procedure proc_1() show warnings;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 call proc_1();
 Level	Code	Message
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 call proc_1();
 Level	Code	Message
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 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'
 call proc_1();
 Level	Code	Message
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t1'
+Note	1051	Unknown table 'test.t2'
 drop procedure proc_1;
 create function func_1() returns int begin show warnings; return 1; end|
 ERROR 0A000: Not allowed to return a result set from a function
 prepare abc from "show warnings";
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 execute abc;
 Level	Code	Message
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 execute abc;
 Level	Code	Message
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 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'
 execute abc;
 Level	Code	Message
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t1'
+Note	1051	Unknown table 'test.t2'
 deallocate prepare abc;
 set @my_password="password";
 set @my_data="clear text to encode";
@@ -2919,7 +2919,7 @@ i	j
 DROP TABLE t1, t2;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 prepare stmt
 from "create table t1 (c char(100) character set utf8, key (c(10)))";
 execute stmt;

=== modified file 'mysql-test/r/ps_1general.result'
--- a/mysql-test/r/ps_1general.result	2010-07-06 20:37:12 +0000
+++ b/mysql-test/r/ps_1general.result	2010-08-30 06:38:09 +0000
@@ -325,10 +325,10 @@ drop table if exists t5;
 prepare stmt1 from ' drop table if exists t5 ' ;
 execute stmt1 ;
 Warnings:
-Note	1051	Unknown table 't5'
+Note	1051	Unknown table 'test.t5'
 prepare stmt1 from ' drop table t5 ' ;
 execute stmt1 ;
-ERROR 42S02: Unknown table 't5'
+ERROR 42S02: Unknown table 'test.t5'
 prepare stmt1 from ' SELECT @@version ' ;
 execute stmt1 ;
 @@version

=== modified file 'mysql-test/r/ps_ddl1.result'
--- a/mysql-test/r/ps_ddl1.result	2009-12-29 12:19:05 +0000
+++ b/mysql-test/r/ps_ddl1.result	2010-08-30 06:38:09 +0000
@@ -420,7 +420,7 @@ call p_verify_reprepare_count(0);
 SUCCESS
 
 execute stmt;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 call p_verify_reprepare_count(0);
 SUCCESS
 

=== modified file 'mysql-test/r/read_only.result'
--- a/mysql-test/r/read_only.result	2009-03-06 14:56:17 +0000
+++ b/mysql-test/r/read_only.result	2010-08-30 06:38:09 +0000
@@ -119,10 +119,10 @@ select @@global.read_only;
 1
 unlock tables;
 drop temporary table ttt;
-ERROR 42S02: Unknown table 'ttt'
+ERROR 42S02: Unknown table 'test.ttt'
 drop temporary table if exists ttt;
 Warnings:
-Note	1051	Unknown table 'ttt'
+Note	1051	Unknown table 'test.ttt'
 connection default;
 set global read_only=0;
 drop table t1,t2;

=== modified file 'mysql-test/r/rename.result'
--- a/mysql-test/r/rename.result	2010-05-28 05:25:11 +0000
+++ b/mysql-test/r/rename.result	2010-08-30 06:38:09 +0000
@@ -39,7 +39,7 @@ select * from t3;
 3	table 3
 drop table if exists t1,t2,t3,t4;
 Warnings:
-Note	1051	Unknown table 't4'
+Note	1051	Unknown table 'test.t4'
 CREATE TABLE t1 (a int);
 CREATE TABLE t3 (a int);
 FLUSH TABLES WITH READ LOCK;

=== modified file 'mysql-test/r/signal.result'
--- a/mysql-test/r/signal.result	2010-07-30 15:28:36 +0000
+++ b/mysql-test/r/signal.result	2010-08-30 06:38:09 +0000
@@ -1562,7 +1562,7 @@ end $$
 call test_resignal() $$
 before RESIGNAL
 before RESIGNAL
-ERROR 42S02: Unknown table 'no_such_table'
+ERROR 42S02: Unknown table 'test.no_such_table'
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -2059,7 +2059,7 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Error	1051	Unknown table 'no_such_table'
+Error	1051	Unknown table 'test.no_such_table'
 Warning	5555	RESIGNAL to a warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2080,7 +2080,7 @@ before RESIGNAL
 ERROR 02444: RESIGNAL to a not found
 show warnings $$
 Level	Code	Message
-Error	1051	Unknown table 'no_such_table'
+Error	1051	Unknown table 'test.no_such_table'
 Error	5555	RESIGNAL to a not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2101,7 +2101,7 @@ before RESIGNAL
 ERROR 44444: RESIGNAL to an error
 show warnings $$
 Level	Code	Message
-Error	1051	Unknown table 'no_such_table'
+Error	1051	Unknown table 'test.no_such_table'
 Error	5555	RESIGNAL to an error
 drop procedure test_resignal $$
 #

=== modified file 'mysql-test/r/signal_demo2.result'
--- a/mysql-test/r/signal_demo2.result	2009-09-10 09:18:29 +0000
+++ b/mysql-test/r/signal_demo2.result	2010-08-30 06:38:09 +0000
@@ -74,7 +74,7 @@ In proc_bottom()
 In proc_bottom()
 Doing something that fail (simulate an error) ...
 Doing something that fail (simulate an error) ...
-ERROR 42S02: Unknown table 'no_such_table'
+ERROR 42S02: Unknown table 'demo.no_such_table'
 call proc_top_a(3);
 Starting ...
 Starting ...
@@ -167,7 +167,7 @@ Doing something that fail (simulate an e
 Doing something that fail (simulate an error) ...
 Doing cleanup !
 Doing cleanup !
-ERROR 42S02: Unknown table 'no_such_table'
+ERROR 42S02: Unknown table 'demo.no_such_table'
 call proc_top_b(3);
 Starting ...
 Starting ...

=== modified file 'mysql-test/r/signal_demo3.result'
--- a/mysql-test/r/signal_demo3.result	2010-07-30 15:28:36 +0000
+++ b/mysql-test/r/signal_demo3.result	2010-08-30 06:38:09 +0000
@@ -77,7 +77,7 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
+Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
@@ -95,7 +95,7 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
+Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
@@ -108,7 +108,7 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
+Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
@@ -123,7 +123,7 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
+Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7

=== modified file 'mysql-test/r/sp-dynamic.result'
--- a/mysql-test/r/sp-dynamic.result	2009-09-10 09:18:29 +0000
+++ b/mysql-test/r/sp-dynamic.result	2010-08-30 06:38:09 +0000
@@ -249,7 +249,7 @@ drop procedure p1|
 drop table if exists t1|
 drop table if exists t2|
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 create table t1 (id integer primary key auto_increment,
 stmt_text char(35), status varchar(20))|
 insert into t1 (stmt_text) values

=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2010-07-30 15:30:30 +0000
+++ b/mysql-test/r/sp-error.result	2010-08-30 06:38:09 +0000
@@ -466,7 +466,7 @@ drop table t5;
 end|
 create table t5 (x int)|
 call bug3294()|
-ERROR 42S02: Unknown table 't5'
+ERROR 42S02: Unknown table 'test.t5'
 drop procedure bug3294|
 drop procedure if exists bug8776_1|
 drop procedure if exists bug8776_2|
@@ -1567,7 +1567,7 @@ f2()
 1
 drop function f2;
 drop table t2;
-ERROR 42S02: Unknown table 't2'
+ERROR 42S02: Unknown table 'test.t2'
 End of 5.1 tests
 drop procedure if exists proc_33983_a;
 drop procedure if exists proc_33983_b;

=== modified file 'mysql-test/r/sp-prelocking.result'
--- a/mysql-test/r/sp-prelocking.result	2007-07-27 14:59:09 +0000
+++ b/mysql-test/r/sp-prelocking.result	2010-08-30 06:38:09 +0000
@@ -22,7 +22,7 @@ call sp1();
 my-col
 1
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'mysqltest.t1'
 select database();
 database()
 mysqltest
@@ -34,7 +34,7 @@ call mysqltest.sp1();
 my-col
 1
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'mysqltest.t1'
 select database();
 database()
 test

=== modified file 'mysql-test/r/sp-vars.result'
--- a/mysql-test/r/sp-vars.result	2010-02-23 18:43:26 +0000
+++ b/mysql-test/r/sp-vars.result	2010-08-30 06:38:09 +0000
@@ -400,7 +400,7 @@ Warnings:
 Note	1305	PROCEDURE test.p2 does not exist
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(log_msg VARCHAR(1024));
 CREATE PROCEDURE p1(arg VARCHAR(255))
 BEGIN

=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2010-08-04 10:34:01 +0000
+++ b/mysql-test/r/sp.result	2010-08-30 06:38:09 +0000
@@ -3272,9 +3272,9 @@ Warnings:
 Note	1051	Unknown table 'test.tv'
 DROP TABLE IF EXISTS tt1,tt2,tt3|
 Warnings:
-Note	1051	Unknown table 'tt1'
-Note	1051	Unknown table 'tt2'
-Note	1051	Unknown table 'tt3'
+Note	1051	Unknown table 'test.tt1'
+Note	1051	Unknown table 'test.tt2'
+Note	1051	Unknown table 'test.tt3'
 CREATE TABLE tt1 (a1 int, a2 int, a3 int, data varchar(10))|
 CREATE TABLE tt2 (a2 int, data2 varchar(10))|
 CREATE TABLE tt3 (a3 int, data3 varchar(10))|

=== modified file 'mysql-test/r/temp_table.result'
--- a/mysql-test/r/temp_table.result	2010-06-23 11:34:40 +0000
+++ b/mysql-test/r/temp_table.result	2010-08-30 06:38:09 +0000
@@ -145,7 +145,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INT);
 CREATE TEMPORARY TABLE t2 (i INT);
 DROP TEMPORARY TABLE t2, t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 SELECT * FROM t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
 SELECT * FROM t1;

=== modified file 'mysql-test/r/truncate_coverage.result'
--- a/mysql-test/r/truncate_coverage.result	2010-06-11 13:32:12 +0000
+++ b/mysql-test/r/truncate_coverage.result	2010-08-30 06:38:09 +0000
@@ -50,7 +50,7 @@ HANDLER t1 CLOSE;
 ERROR 42S02: Table 'test.t1' doesn't exist
 UNLOCK TABLES;
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 SET DEBUG_SYNC='RESET';
 CREATE TABLE t1 (c1 INT);
 INSERT INTO t1 VALUES (1);

=== modified file 'mysql-test/r/type_newdecimal.result'
--- a/mysql-test/r/type_newdecimal.result	2010-04-11 06:52:42 +0000
+++ b/mysql-test/r/type_newdecimal.result	2010-08-30 06:38:09 +0000
@@ -680,7 +680,7 @@ select 0.8 = 0.7 + 0.1;
 1
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 create table t1 (col1 decimal(38));
 insert into t1 values (12345678901234567890123456789012345678);
 select * from t1;

=== modified file 'mysql-test/r/view.result'
--- a/mysql-test/r/view.result	2010-08-04 10:34:01 +0000
+++ b/mysql-test/r/view.result	2010-08-30 06:38:09 +0000
@@ -199,11 +199,11 @@ c	d
 2	5
 3	10
 drop view v100;
-ERROR 42S02: Unknown table 'v100'
+ERROR 42S02: Unknown table 'test.v100'
 drop view t1;
 ERROR HY000: 'test.t1' is not VIEW
 drop table v1;
-ERROR 42S02: Unknown table 'v1'
+ERROR 42S02: Unknown table 'test.v1'
 drop view v1,v2;
 drop table t1;
 create table t1 (a int);
@@ -2868,7 +2868,7 @@ Tables_in_test
 t1
 v1
 DROP VIEW v2,v1;
-ERROR 42S02: Unknown table 'v2'
+ERROR 42S02: Unknown table 'test.v2'
 SHOW TABLES;
 Tables_in_test
 t1

=== modified file 'mysql-test/r/warnings.result'
--- a/mysql-test/r/warnings.result	2010-03-20 09:35:40 +0000
+++ b/mysql-test/r/warnings.result	2010-08-30 06:38:09 +0000
@@ -48,13 +48,13 @@ drop table t1;
 set SQL_WARNINGS=0;
 drop temporary table if exists not_exists;
 Warnings:
-Note	1051	Unknown table 'not_exists'
+Note	1051	Unknown table 'test.not_exists'
 drop table if exists not_exists_table;
 Warnings:
-Note	1051	Unknown table 'not_exists_table'
+Note	1051	Unknown table 'test.not_exists_table'
 show warnings limit 1;
 Level	Code	Message
-Note	1051	Unknown table 'not_exists_table'
+Note	1051	Unknown table 'test.not_exists_table'
 drop database if exists not_exists_db;
 Warnings:
 Note	1008	Can't drop database 'not_exists_db'; database doesn't exist
@@ -311,8 +311,8 @@ insert into t2 values(@q);
 ERROR 22001: Data too long for column 'c_tinyblob' at row 1
 drop table t1, t2;
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 SHOW ERRORS;
 Level	Code	Message
-Error	1051	Unknown table 't1'
+Error	1051	Unknown table 'test.t1'
 End of 5.0 tests

=== modified file 'mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2010-08-20 03:51:38 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2010-08-30 06:38:09 +0000
@@ -308,7 +308,7 @@ CREATE TABLE t2 (primary key (a)) engine
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 DROP TABLE if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 INSERT INTO t1 values (3,3);
 CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
@@ -317,7 +317,7 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
 INSERT INTO t1 VALUES (4,4);
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-08-20 03:51:38 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-08-30 06:38:09 +0000
@@ -302,7 +302,7 @@ CREATE TABLE t2 (primary key (a)) engine
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 DROP TABLE if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 INSERT INTO t1 values (3,3);
 CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
@@ -311,7 +311,7 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
 INSERT INTO t1 VALUES (4,4);
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

=== modified file 'mysql-test/suite/innodb/r/innodb-autoinc.result'
--- a/mysql-test/suite/innodb/r/innodb-autoinc.result	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/r/innodb-autoinc.result	2010-08-30 06:38:09 +0000
@@ -171,7 +171,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (NULL, 1);
 DELETE FROM t1 WHERE c1 = 1;
@@ -184,7 +184,7 @@ c1	c2
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (NULL, 1);
 DELETE FROM t1 WHERE c1 = 1;
@@ -203,7 +203,7 @@ auto_increment_increment	100
 auto_increment_offset	10
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (NULL),(5),(NULL);
 INSERT INTO t1 VALUES (250),(NULL);
@@ -236,7 +236,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(0);
 SELECT * FROM t1;
@@ -275,7 +275,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(-1);
 SELECT * FROM t1;
@@ -321,7 +321,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(-1);
 Warnings:
@@ -376,7 +376,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(-1);
 Warnings:
@@ -425,7 +425,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL);
 INSERT INTO t1 VALUES (9223372036854775794);
@@ -458,7 +458,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL);
 INSERT INTO t1 VALUES (18446744073709551603);
@@ -491,7 +491,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL);
 INSERT INTO t1 VALUES (18446744073709551603);
@@ -520,7 +520,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL);
 INSERT INTO t1 VALUES(-9223372036854775806);
@@ -556,7 +556,7 @@ auto_increment_increment	1
 auto_increment_offset	1
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL);
 INSERT INTO t1 VALUES (18446744073709551610);
@@ -630,10 +630,10 @@ DROP TABLE t1;
 SET @@SESSION.AUTO_INCREMENT_INCREMENT=1, @@SESSION.AUTO_INCREMENT_OFFSET=5;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t1 (
 a INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 b INT(10) UNSIGNED NOT NULL,
@@ -850,10 +850,10 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t1(
 c1 INT(10) UNSIGNED NOT NULL AUTO_INCREMENT
 PRIMARY KEY) ENGINE=InnoDB;
@@ -1099,7 +1099,7 @@ c1	c2
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
 INSERT INTO t1(C2) VALUES ('innodb');
@@ -1124,7 +1124,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 SET c1 = 1;
 SHOW CREATE TABLE t1;
@@ -1163,7 +1163,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1  (c1 INTEGER AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE=InnoDB;
 INSERT INTO  t1 VALUES (-685113344), (1), (NULL), (NULL);
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/innodb/r/innodb.result'
--- a/mysql-test/suite/innodb/r/innodb.result	2010-07-28 08:23:31 +0000
+++ b/mysql-test/suite/innodb/r/innodb.result	2010-08-30 06:38:09 +0000
@@ -3073,7 +3073,7 @@ c29 CHAR(255), c30 CHAR(255), c31 CHAR(2
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(
 id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY
 ) ENGINE=InnoDB;
@@ -3092,8 +3092,8 @@ SET TX_ISOLATION='read-committed';
 SET AUTOCOMMIT=0;
 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 ( a int ) ENGINE=InnoDB;
 CREATE TABLE t2 LIKE t1;
 SELECT * FROM t2;

=== modified file 'mysql-test/suite/innodb/r/innodb_mysql.result'
--- a/mysql-test/suite/innodb/r/innodb_mysql.result	2010-08-23 17:43:34 +0000
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result	2010-08-30 06:38:09 +0000
@@ -435,7 +435,7 @@ set global query_cache_size=10*1024*1024
 set global query_cache_type=1;
 drop table if exists `test`;
 Warnings:
-Note	1051	Unknown table 'test'
+Note	1051	Unknown table 'test.test'
 CREATE TABLE `test` (`test1` varchar(3) NOT NULL,
 `test2` varchar(4) NOT NULL,PRIMARY KEY  (`test1`))
 ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -633,7 +633,7 @@ select * from bug29807;
 ERROR 42S02: Table 'test.bug29807' doesn't exist
 drop table t1;
 drop table bug29807;
-ERROR 42S02: Unknown table 'bug29807'
+ERROR 42S02: Unknown table 'test.bug29807'
 create table bug29807 (a int);
 drop table bug29807;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
@@ -710,12 +710,12 @@ CREATE TABLE t2 (primary key (a)) select
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 drop table if exists t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t2 (a int, b int, primary key (a));
 BEGIN;
 INSERT INTO t2 values(100,100);

=== modified file 'mysql-test/suite/rpl/r/rpl000013.result'
--- a/mysql-test/suite/rpl/r/rpl000013.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl000013.result	2010-08-30 06:38:09 +0000
@@ -25,4 +25,4 @@ Variable_name	Value
 Slave_open_temp_tables	0
 drop table if exists t1,t2;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'

=== modified file 'mysql-test/suite/rpl/r/rpl_drop.result'
--- a/mysql-test/suite/rpl/r/rpl_drop.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop.result	2010-08-30 06:38:09 +0000
@@ -7,4 +7,4 @@ start slave;
 drop table if exists t1, t2;
 create table t1 (a int);
 drop table t1, t2;
-ERROR 42S02: Unknown table 't2'
+ERROR 42S02: Unknown table 'test.t2'

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_temp.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_temp.result	2010-06-29 10:54:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_temp.result	2010-08-30 06:38:09 +0000
@@ -14,12 +14,12 @@ Slave_open_temp_tables	0
 drop database mysqltest;
 DROP TEMPORARY TABLE IF EXISTS tmp1;
 Warnings:
-Note	1051	Unknown table 'tmp1'
+Note	1051	Unknown table 'test.tmp1'
 CREATE TEMPORARY TABLE t1 ( a int );
 DROP TEMPORARY TABLE t1, t2;
-ERROR 42S02: Unknown table 't2'
+ERROR 42S02: Unknown table 'test.t2'
 DROP TEMPORARY TABLE tmp2;
-ERROR 42S02: Unknown table 'tmp2'
+ERROR 42S02: Unknown table 'test.tmp2'
 stop slave;
 **** On Master ****
 CREATE TEMPORARY TABLE tmp3 (a int);

=== modified file 'mysql-test/suite/rpl/r/rpl_drop_view.result'
--- a/mysql-test/suite/rpl/r/rpl_drop_view.result	2008-11-13 19:19:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_drop_view.result	2010-08-30 06:38:09 +0000
@@ -13,9 +13,9 @@ create view v1 as select * from t1;
 create view v2 as select * from t2;
 create view v3 as select * from t3;
 drop view not_exist_view;
-ERROR 42S02: Unknown table 'not_exist_view'
+ERROR 42S02: Unknown table 'test.not_exist_view'
 drop view v1, not_exist_view;
-ERROR 42S02: Unknown table 'not_exist_view'
+ERROR 42S02: Unknown table 'test.not_exist_view'
 select * from v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 drop view v2, v3;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-07-12 11:55:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-08-30 06:38:09 +0000
@@ -4,7 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-07-12 11:55:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-08-30 06:38:09 +0000
@@ -4,7 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2010-06-30 15:25:13 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2010-08-30 06:38:09 +0000
@@ -129,5 +129,5 @@ DROP TABLE IF EXISTS t4;
 DROP TABLE IF EXISTS t5;
 DROP TABLE IF EXISTS t6;
 Warnings:
-Note	1051	Unknown table 't6'
+Note	1051	Unknown table 'test.t6'
 DROP PROCEDURE p1;

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2010-08-20 02:59:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2010-08-30 06:38:09 +0000
@@ -15,35 +15,35 @@ CREATE TEMPORARY TABLE nt_tmp_xx_1 ( id 
 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= '';
 #########################################################################
@@ -69,7 +69,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -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-
@@ -77,7 +77,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_xx_1` /* generated by server */
@@ -85,7 +85,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
@@ -94,7 +94,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp_2`,`tt_1` /* generated by server */
@@ -102,7 +102,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
@@ -111,7 +111,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp_2` /* generated by server */
@@ -218,7 +218,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -231,10 +231,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -251,7 +251,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -266,11 +266,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -288,7 +288,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -302,10 +302,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -324,7 +324,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -339,11 +339,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -361,7 +361,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -377,10 +377,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -403,7 +403,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -421,11 +421,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -632,7 +632,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -645,10 +645,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -667,7 +667,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -682,11 +682,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -706,7 +706,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -720,10 +720,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -744,7 +744,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -759,11 +759,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -783,7 +783,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -799,10 +799,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -827,7 +827,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -845,11 +845,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -1005,7 +1005,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Xe << -e-e-e-e-e-e-e-e-e-e-e-
@@ -1013,7 +1013,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `xx_1` /* generated by server */
@@ -1021,7 +1021,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `tt_2`,`xx_1` /* generated by server */
@@ -1030,7 +1030,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `tt_2`,`xx_1` /* generated by server */
@@ -1038,7 +1038,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2`,`xx_1` /* generated by server */
@@ -1047,7 +1047,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `nt_2`,`xx_1` /* generated by server */
@@ -1123,7 +1123,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1136,7 +1136,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1149,7 +1149,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1163,7 +1163,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1176,7 +1176,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1190,7 +1190,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2010-08-20 03:37:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2010-08-30 06:38:09 +0000
@@ -487,7 +487,7 @@ master-bin.000001	#	Query	#	#	use `test`
 INSERT INTO tt_1(ddl_case) VALUES (3);
 DROP TABLE IF EXISTS tt_xx, new_tt_xx;
 Warnings:
-Note	1051	Unknown table 'tt_xx'
+Note	1051	Unknown table 'test.tt_xx'
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

=== modified file 'mysql-test/suite/rpl/r/rpl_multi_update3.result'
--- a/mysql-test/suite/rpl/r/rpl_multi_update3.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_multi_update3.result	2010-08-30 06:38:09 +0000
@@ -124,10 +124,10 @@ i	j	x	y	z
 DROP TABLE t1, t2, t3;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t1 (
 idp int(11) NOT NULL default '0',
 idpro int(11) default NULL,

=== modified file 'mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2010-04-28 12:47:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2010-08-30 06:38:09 +0000
@@ -130,9 +130,9 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE IF EXISTS t4;
 Warnings:
-Note	1051	Unknown table 't4'
+Note	1051	Unknown table 'test.t4'
 DROP TABLE IF EXISTS t5;
 DROP TABLE IF EXISTS t6;
 Warnings:
-Note	1051	Unknown table 't6'
+Note	1051	Unknown table 'test.t6'
 DROP PROCEDURE p1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result	2010-07-27 14:04:13 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result	2010-08-30 06:38:09 +0000
@@ -10,7 +10,7 @@ DROP TABLE IF EXISTS t1;
 Checking MYSQL_TYPE_NEWDECIMAL fields
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 STOP SLAVE;
 RESET SLAVE;
 CREATE TABLE t1 (a DECIMAL(5,2));

=== modified file 'mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2010-08-20 02:59:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result	2010-08-30 06:38:09 +0000
@@ -15,35 +15,35 @@ CREATE TEMPORARY TABLE nt_tmp_xx_1 ( id 
 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= '';
 #########################################################################
@@ -69,7 +69,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -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-
@@ -77,7 +77,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_xx_1` /* generated by server */
@@ -85,7 +85,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp_2` /* generated by server */
@@ -94,7 +94,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp_2`,`tt_1` /* generated by server */
@@ -102,7 +102,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp_2` /* generated by server */
@@ -111,7 +111,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp_2` /* generated by server */
@@ -224,7 +224,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -238,10 +238,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -260,7 +260,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -276,11 +276,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -300,7 +300,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -315,10 +315,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -339,7 +339,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -355,11 +355,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -379,7 +379,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -396,10 +396,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -424,7 +424,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -443,11 +443,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -671,7 +671,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -685,10 +685,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -709,7 +709,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -725,11 +725,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -751,7 +751,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -766,10 +766,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -792,7 +792,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -808,11 +808,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -834,7 +834,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -851,10 +851,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -881,7 +881,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -900,11 +900,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -1071,7 +1071,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Xe << -e-e-e-e-e-e-e-e-e-e-e-
@@ -1079,7 +1079,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `xx_1` /* generated by server */
@@ -1087,7 +1087,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `tt_2`,`xx_1` /* generated by server */
@@ -1096,7 +1096,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `tt_2`,`xx_1` /* generated by server */
@@ -1104,7 +1104,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2`,`xx_1` /* generated by server */
@@ -1113,7 +1113,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `nt_2`,`xx_1` /* generated by server */
@@ -1191,7 +1191,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1205,7 +1205,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1219,7 +1219,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1234,7 +1234,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1248,7 +1248,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1263,7 +1263,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN

=== modified file 'mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result	2010-08-20 02:59:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result	2010-08-30 06:38:09 +0000
@@ -522,7 +522,7 @@ master-bin.000001	#	Query	#	#	use `test`
 INSERT INTO tt_1(ddl_case) VALUES (3);
 DROP TABLE IF EXISTS tt_xx, new_tt_xx;
 Warnings:
-Note	1051	Unknown table 'tt_xx'
+Note	1051	Unknown table 'test.tt_xx'
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

=== modified file 'mysql-test/suite/rpl/r/rpl_session_var.result'
--- a/mysql-test/suite/rpl/r/rpl_session_var.result	2007-07-28 09:10:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_session_var.result	2010-08-30 06:38:09 +0000
@@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 create table t1(a varchar(100),b int);
 set @@session.sql_mode=pipes_as_concat;
 insert into t1 values('My'||'SQL', 1);

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2010-06-30 20:56:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2010-08-30 06:38:09 +0000
@@ -129,5 +129,5 @@ DROP TABLE IF EXISTS t4;
 DROP TABLE IF EXISTS t5;
 DROP TABLE IF EXISTS t6;
 Warnings:
-Note	1051	Unknown table 't6'
+Note	1051	Unknown table 'test.t6'
 DROP PROCEDURE p1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2010-08-20 02:59:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result	2010-08-30 06:38:09 +0000
@@ -15,35 +15,35 @@ CREATE TEMPORARY TABLE nt_tmp_xx_1 ( id 
 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= '';
 #########################################################################
@@ -69,7 +69,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -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-
@@ -77,7 +77,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_xx_1` /* generated by server */
@@ -85,7 +85,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
@@ -94,7 +94,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp_2`,`tt_1` /* generated by server */
@@ -102,7 +102,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
@@ -111,7 +111,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp_2` /* generated by server */
@@ -218,7 +218,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -231,10 +231,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -251,7 +251,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -266,11 +266,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -288,7 +288,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -302,10 +302,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -324,7 +324,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -339,11 +339,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -361,7 +361,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -377,10 +377,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -403,7 +403,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -421,11 +421,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -632,7 +632,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -645,10 +645,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N 
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -667,7 +667,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -682,11 +682,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -706,7 +706,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -720,10 +720,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -744,7 +744,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -759,11 +759,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -783,7 +783,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -799,10 +799,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N
 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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -827,7 +827,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -845,11 +845,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	1196	Some non-transactional changed tables couldn't be rolled back
@@ -1005,7 +1005,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Xe << -e-e-e-e-e-e-e-e-e-e-e-
@@ -1013,7 +1013,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `xx_1` /* generated by server */
@@ -1021,7 +1021,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `tt_2`,`xx_1` /* generated by server */
@@ -1030,7 +1030,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `tt_2`,`xx_1` /* generated by server */
@@ -1038,7 +1038,7 @@ master-bin.000001	#	Query	#	#	use `test`
 
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2`,`xx_1` /* generated by server */
@@ -1047,7 +1047,7 @@ master-bin.000001	#	Query	#	#	use `test`
 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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `nt_2`,`xx_1` /* generated by server */
@@ -1123,7 +1123,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1136,7 +1136,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1149,7 +1149,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1163,7 +1163,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1176,7 +1176,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
@@ -1190,7 +1190,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-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result	2010-08-20 03:37:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result	2010-08-30 06:38:09 +0000
@@ -486,7 +486,7 @@ master-bin.000001	#	Query	#	#	use `test`
 INSERT INTO tt_1(ddl_case) VALUES (3);
 DROP TABLE IF EXISTS tt_xx, new_tt_xx;
 Warnings:
-Note	1051	Unknown table 'tt_xx'
+Note	1051	Unknown table 'test.tt_xx'
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_no_op.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_no_op.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_no_op.result	2010-08-30 06:38:09 +0000
@@ -13,7 +13,7 @@ ERROR 42000: Unknown database 'mysqltest
 create table t1 (a int);
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 create table t1 (a int, b int);

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_until.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-07-27 14:04:13 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-08-30 06:38:09 +0000
@@ -92,7 +92,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 drop table if exists t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 flush logs;
 stop slave;
 reset slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_temp_table.result'
--- a/mysql-test/suite/rpl/r/rpl_temp_table.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temp_table.result	2010-08-30 06:38:09 +0000
@@ -45,4 +45,4 @@ Variable_name	Value
 Slave_open_temp_tables	0
 drop table if exists t1,t2;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'

=== modified file 'mysql-test/suite/sys_vars/r/slow_query_log_func.result'
--- a/mysql-test/suite/sys_vars/r/slow_query_log_func.result	2010-06-08 08:58:19 +0000
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_func.result	2010-08-30 06:38:09 +0000
@@ -81,7 +81,7 @@ DROP FUNCTION f_slow_current_time;
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
 DROP PROCEDURE IF EXISTS p1;
 CREATE PROCEDURE p1()

=== modified file 'mysql-test/suite/sys_vars/r/sql_notes_func.result'
--- a/mysql-test/suite/sys_vars/r/sql_notes_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_notes_func.result	2010-08-30 06:38:09 +0000
@@ -13,7 +13,7 @@ SELECT @@warning_count;
 0 Expected
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 SELECT @@warning_count;
 @@warning_count
 1

=== modified file 'mysql-test/t/drop.test'
--- a/mysql-test/t/drop.test	2010-06-07 15:27:40 +0000
+++ b/mysql-test/t/drop.test	2010-08-30 06:38:09 +0000
@@ -273,3 +273,40 @@ DROP TABLE t1, t1;
 
 UNLOCK TABLES;
 DROP TABLE t1;
+
+--echo #
+--echo # BUG#34750: Print database name in Unknown Table error message
+--echo #
+
+--echo 
+--echo # Test error message when droping table/view
+
+--error ER_BAD_TABLE_ERROR
+DROP TABLE table1;
+--error ER_BAD_TABLE_ERROR
+DROP TABLE table1,table2;
+--error ER_BAD_TABLE_ERROR
+DROP VIEW view1,view2,view3,view4;
+--echo
+DROP TABLE IF EXISTS table1;
+DROP TABLE IF EXISTS table1,table2;
+DROP VIEW IF EXISTS view1,view2,view3,view4;
+
+--echo
+--echo # Test error message when trigger does not find table
+
+CREATE TABLE table1(a int);
+CREATE TABLE table2(b int);
+
+# Database name is only available (for printing) if specified in 
+# the trigger definition
+CREATE TRIGGER trg1 AFTER INSERT ON table1
+FOR EACH ROW
+  INSERT INTO table2 SELECT t.notable.*;
+
+--error ER_BAD_TABLE_ERROR
+INSERT INTO table1 VALUES (1);
+
+DROP TABLE table1,table2;
+
+--echo # End BUG#34750

=== modified file 'sql/sql_admin.cc'
--- a/sql/sql_admin.cc	2010-08-24 10:52:32 +0000
+++ b/sql/sql_admin.cc	2010-08-30 06:38:09 +0000
@@ -591,8 +591,14 @@ send_result_message:
     case HA_ADMIN_NOT_BASE_TABLE:
       {
         char buf[MYSQL_ERRMSG_SIZE];
+
+        String tbl_name;
+        tbl_name.append(String(db,system_charset_info));
+        tbl_name.append('.');
+        tbl_name.append(String(table_name,system_charset_info));
+
         size_t length= my_snprintf(buf, sizeof(buf),
-                                 ER(ER_BAD_TABLE_ERROR), table_name);
+                                   ER(ER_BAD_TABLE_ERROR), tbl_name.c_ptr());
         protocol->store(STRING_WITH_LEN("note"), system_charset_info);
         protocol->store(buf, length, system_charset_info);
       }

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-08-20 09:15:16 +0000
+++ b/sql/sql_base.cc	2010-08-30 06:38:09 +0000
@@ -8167,7 +8167,17 @@ insert_fields(THD *thd, Name_resolution_
   if (!table_name)
     my_message(ER_NO_TABLES_USED, ER(ER_NO_TABLES_USED), MYF(0));
   else
-    my_error(ER_BAD_TABLE_ERROR, MYF(0), table_name);
+  {
+    String tbl_name;
+    if (db_name)
+    {
+      tbl_name.append(String(db_name,system_charset_info));
+      tbl_name.append('.');
+    }
+    tbl_name.append(String(table_name,system_charset_info));
+
+    my_error(ER_BAD_TABLE_ERROR, MYF(0), tbl_name.c_ptr());
+  }
 
   DBUG_RETURN(TRUE);
 }

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-08-24 12:59:07 +0000
+++ b/sql/sql_table.cc	2010-08-30 06:38:09 +0000
@@ -2365,9 +2365,16 @@ int mysql_rm_table_part2(THD *thd, TABLE
           . ./sql/datadict.cc +32 /Alfranio - TODO: We need to test this.
       */
       if (if_exists)
+      {
+        String tbl_name;
+        tbl_name.append(String(db,system_charset_info));
+        tbl_name.append('.');
+        tbl_name.append(String(table->table_name,system_charset_info));
+
 	push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 			    ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR),
-			    table->table_name);
+			    tbl_name.c_ptr());
+      }
       else
       {
         non_tmp_error = (drop_temporary ? non_tmp_error : TRUE);
@@ -2425,6 +2432,9 @@ int mysql_rm_table_part2(THD *thd, TABLE
     {
       if (wrong_tables.length())
 	wrong_tables.append(',');
+
+      wrong_tables.append(String(db,system_charset_info));
+      wrong_tables.append('.');
       wrong_tables.append(String(table->table_name,system_charset_info));
     }
     DBUG_PRINT("table", ("table: 0x%lx  s: 0x%lx", (long) table->table,

=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc	2010-08-20 09:15:16 +0000
+++ b/sql/sql_view.cc	2010-08-30 06:38:09 +0000
@@ -1660,13 +1660,15 @@ bool mysql_drop_view(THD *thd, TABLE_LIS
     if (access(path, F_OK) || 
         FRMTYPE_VIEW != (type= dd_frm_type(thd, path, &not_used)))
     {
-      char name[FN_REFLEN];
-      my_snprintf(name, sizeof(name), "%s.%s", view->db, view->table_name);
       if (thd->lex->drop_if_exists)
       {
+        String tbl_name;
+        tbl_name.append(String(view->db,system_charset_info));
+        tbl_name.append('.');
+        tbl_name.append(String(view->table_name,system_charset_info));
 	push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 			    ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR),
-			    name);
+			    tbl_name.c_ptr());
 	continue;
       }
       if (type == FRMTYPE_TABLE)
@@ -1681,6 +1683,9 @@ bool mysql_drop_view(THD *thd, TABLE_LIS
       {
         if (non_existant_views.length())
           non_existant_views.append(',');
+
+        non_existant_views.append(String(view->db,system_charset_info));
+        non_existant_views.append('.');
         non_existant_views.append(String(view->table_name,system_charset_info));
       }
       continue;

Attachment: [text/bzr-bundle] bzr/jorgen.loland@oracle.com-20100830063809-z3n0eu7qp1h5v3ip.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3260) Bug#34750Jorgen Loland30 Aug