1 files changed, 19 insertions, 18 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index de391fbe288..759ed7d22b3 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -4,6 +4,7 @@
 
 --disable_warnings
 drop table if exists t1,t2;
+drop database if exists mysqltest;
 --enable_warnings
 
 create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
@@ -261,42 +262,42 @@ drop table t1, t2, t3;
 # Test for bug #3342 SHOW CREATE DATABASE seems to require DROP privilege
 #
 
-create database test_$1;
-show create database test_$1;
-create table test_$1.t1(a int);
-insert into test_$1.t1 values(1);
-grant select on `test_$1`.* to mysqltest_1@localhost;
-grant usage  on `test_$1`.* to mysqltest_2@localhost;
-grant drop   on `test_$1`.* to mysqltest_3@localhost;
+create database mysqltest;
+show create database mysqltest;
+create table mysqltest.t1(a int);
+insert into mysqltest.t1 values(1);
+grant select on `mysqltest`.* to mysqltest_1@localhost;
+grant usage  on `mysqltest`.* to mysqltest_2@localhost;
+grant drop   on `mysqltest`.* to mysqltest_3@localhost;
 
-connect (con1,localhost,mysqltest_1,,test_$1);
+connect (con1,localhost,mysqltest_1,,mysqltest);
 connection con1;
 select * from t1;
-show create database test_$1;
+show create database mysqltest;
 --error 1044
 drop table t1;
 --error 1044
-drop database test_$1;
+drop database mysqltest;
 
 connect (con2,localhost,mysqltest_2,,test);
 connection con2;
 --error 1044
-select * from test_$1.t1;
+select * from mysqltest.t1;
 --error 1044
-show create database test_$1;
+show create database mysqltest;
 --error 1044
-drop table test_$1.t1;
+drop table mysqltest.t1;
 --error 1044
-drop database test_$1;
+drop database mysqltest;
 
 connect (con3,localhost,mysqltest_3,,test);
 connection con3;
 --error 1044
-select * from test_$1.t1;
+select * from mysqltest.t1;
 --error 1044
-show create database test_$1;
-drop table test_$1.t1;
-drop database test_$1;
+show create database mysqltest;
+drop table mysqltest.t1;
+drop database mysqltest;
 
 connection default;
 set names binary;