diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 7c556354d2e..495f381020e 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -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 * from t1;
 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 exist
 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
@@ -1610,12 +1610,12 @@ CREATE 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 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'
@@ -1911,13 +1911,12 @@ show tables;
 Tables_in_test
 #mysql50#t-1
 create table `t-1` (a int);
-ERROR 42S01: Table '#mysql50#t-1' already exists
 create table t1 (a int);
 alter table t1 rename `t-1`;
-ERROR 42S01: Table '#mysql50#t-1' already exists
+ERROR 42S01: Table 't-1' already exists
 rename table t1 to `t-1`;
-ERROR 42S01: Table '#mysql50#t-1' already exists
-drop table `#mysql50#t-1`, t1;
+ERROR 42S01: Table 't-1' already exists
+drop table `#mysql50#t-1`, t1, `t-1`;
 
 End of 5.1 tests
 
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index a61f89539cb..4e52830b897 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1574,14 +1574,13 @@ flush tables;
 --remove_file $MYSQLD_DATADIR/test/t@002d1.MYI
 --remove_file $MYSQLD_DATADIR/test/t@002d1.frm
 show tables;
---error ER_TABLE_EXISTS_ERROR
 create table `t-1` (a int);
 create table t1 (a int);
 --error ER_TABLE_EXISTS_ERROR
 alter table t1 rename `t-1`;
 --error ER_TABLE_EXISTS_ERROR
 rename table t1 to `t-1`;
-drop table `#mysql50#t-1`, t1;
+drop table `#mysql50#t-1`, t1, `t-1`;
 
 --echo
 --echo End of 5.1 tests