Merged with 3.23, needs further fix-up

26 files changed, 236 insertions, 42 deletions

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 6deb69b49df..d98c10a29a9 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -27,10 +27,10 @@ CLEANFILES = 		$(test_SCRIPTS)
 dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
 		$(distdir)/std_data
-	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
 	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
-	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data
 
 install-data-local:
 	$(mkinstalldirs) \
diff --git a/mysql-test/include/have_default_master.inc b/mysql-test/include/have_default_master.inc
deleted file mode 100644
index eff1414c16a..00000000000
--- a/mysql-test/include/have_default_master.inc
+++ /dev/null
@@ -1,3 +0,0 @@
--- require r/have_default_master.require
-connection master;
-show variables like "port";
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index 69ab73db6b5..61077f898f6 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -9,5 +9,7 @@ connection master;
 reset master;
 connection slave;
 reset slave;
+# Clean up old test tables
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 slave start;
 @r/slave-running.result show status like 'Slave_running';
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh
index 6fd32d37cd0..049ac6b1cd7 100644
--- a/mysql-test/install_test_db.sh
+++ b/mysql-test/install_test_db.sh
@@ -25,8 +25,8 @@ then
  data=var/slave-data
  ldata=$fix_bin/var/slave-data
 else
- data=var/lib
- ldata=$fix_bin/var/lib
+ data=var/master-data
+ ldata=$fix_bin/var/master-data
 fi
 
 mdata=$data/mysql
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 3e299fb2f25..9216ae5a74f 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -198,7 +198,7 @@ done
 #--
 
 MYRUN_DIR=$MYSQL_TEST_DIR/var/run
-MASTER_MYDDIR="$MYSQL_TEST_DIR/var/lib"
+MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data"
 MASTER_MYSOCK="$MYSQL_TMP_DIR/mysql-master.sock"
 MASTER_MYPID="$MYRUN_DIR/mysqld.pid"
 MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log"
@@ -298,6 +298,8 @@ prompt_user ()
  read unused
 }
 
+# We can't use diff -u as this isn't portable
+
 show_failed_diff ()
 {
   reject_file=r/$1.reject
@@ -306,7 +308,7 @@ show_failed_diff ()
   then
     echo "Below are the diffs between actual and expected results:"
     echo "-------------------------------------------------------"
-    $DIFF -u $result_file $reject_file
+    $DIFF -c $result_file $reject_file
     echo "-------------------------------------------------------"
     echo "Please e-mail the above, along with the output of mysqlbug"
     echo "and any other relevant info to bugs@lists.mysql.com"
@@ -377,6 +379,8 @@ mysql_install_db () {
 	error "Could not install slave test DBs"
 	exit 1
     fi
+    # Give mysqld some time to die.
+    sleep $SLEEP_TIME
     return 0
 }
 
@@ -515,7 +519,7 @@ start_slave()
 	    --core \
 	    --tmpdir=$MYSQL_TMP_DIR \
             --language=english \
-	    --skip-innodb \
+	    --skip-innodb --skip-slave-start \
 	     $SMALL_SERVER \
              $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
     if [ x$DO_DDD = x1 ]
diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result
index 5bfa1e9013e..2bbe15954dc 100644
--- a/mysql-test/r/backup.result
+++ b/mysql-test/r/backup.result
@@ -1,5 +1,5 @@
 Table	Op	Msg_type	Msg_text
-t1	backup	error	Failed copying .frm file: errno = X
+test.t1	backup	error	Failed copying .frm file: errno = X
 test.t1	backup	status	Operation failed
 Table	Op	Msg_type	Msg_text
 test.t1	backup	status	OK
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index 2e760ae5b75..5e227313e4a 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -492,3 +492,20 @@ a	1
 a	2
 MIN(B)	MAX(b)
 1	1
+id
+0
+1
+2
+id
+0
+1
+2
+id
+0
+1
+2
+id	id3
+0	0
+1	1
+2	2
+100	2
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index ced1a3cd178..2c4a5cecbb1 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -30,3 +30,7 @@ Documentation		0
 Host communication		0
 kkkkkkkkkkk lllllllllll		3
 Test Procedures		0
+1+1	a	count(*)
+2	a	0
+1+1	a	count(*)
+2	a	0
diff --git a/mysql-test/r/have_default_master.require b/mysql-test/r/have_default_master.require
deleted file mode 100644
index ca8342ffb08..00000000000
--- a/mysql-test/r/have_default_master.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-port	9306
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 12f193bbdd9..f030b7fa763 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -449,3 +449,29 @@ a
 1
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	PRIMARY	PRIMARY	4	NULL	1	where used
+id
+0
+1
+2
+id
+0
+1
+2
+id
+0
+1
+2
+id	id3
+0	0
+1	1
+2	2
+100	2
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` char(20) default NULL,
+  KEY `a` (`a`)
+) TYPE=InnoDB
+a
+1
+2
+3
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 7b116326fc4..7b1be604024 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -1,2 +1,6 @@
 dummy1	count(distinct id)
 NULL	1
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t2	check	error	Table 't2' was not locked with LOCK TABLES
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index d2cb8ee5436..a47c3c91c1d 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -1,13 +1,13 @@
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	73	No			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	No			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	173	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	173	Yes			0		0
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
 n
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 5899d76c82f..58487af27f8 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -3,11 +3,11 @@ master-bin.001	73
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
 		0	0		0	No			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	test	3306	60		4	No			0		0
+127.0.0.1	test	9998	60		4	No			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	60		4	No			0		0
+127.0.0.1	root	9999	60		4	No			0		0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	60	master-bin.001	73	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.001	73	Yes			0		0
 n
 10
 45
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index da9dccae9f4..abe4275a124 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -1,5 +1,5 @@
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	60	master-bin.001	216	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.001	216	Yes			0		0
 s
 Could not break slave
 Tried hard
@@ -10,7 +10,7 @@ master-bin.003
 Log_name
 master-bin.003
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	60	master-bin.003	184	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.003	184	Yes			0		0
 m
 34
 65
@@ -25,6 +25,6 @@ master-bin.006
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.006	131		
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	60	master-bin.006	131	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.006	131	Yes			0		0
 count(*)
 100
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 8c50570a31d..ce2e5d4f58d 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -67,3 +67,16 @@ t1	0	PRIMARY	1	f1	A	1	NULL	NULL
 t1	0	PRIMARY	2	f2	A	3	NULL	NULL	
 t1	0	PRIMARY	3	f3	A	9	NULL	NULL	
 t1	0	PRIMARY	4	f4	A	18	NULL	NULL	
+Table	Create Table
+t1	CREATE TEMPORARY TABLE `t1` (
+  `a` int(11) NOT NULL default '0'
+) TYPE=MyISAM
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `a` int(11) NOT NULL default '0'
+) TYPE=MyISAM
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `test_set` set('val1','val2','val3') NOT NULL default '',
+  `name` char(20) default 'O''Brien'
+) TYPE=MyISAM COMMENT='it''s a table'
diff --git a/mysql-test/r/shw000001.result b/mysql-test/r/shw000001.result
deleted file mode 100644
index c8056c74f0b..00000000000
--- a/mysql-test/r/shw000001.result
+++ /dev/null
@@ -1,5 +0,0 @@
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `test_set` set('val1','val2','val3') NOT NULL default '',
-  `name` char(20) default 'O''Brien'
-) TYPE=MyISAM COMMENT='it''s a table'
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index 564491fc520..96296e238fd 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -678,3 +678,30 @@ CREATE TABLE t1 (
 INSERT INTO t1 VALUES (1, 1);
 SELECT MIN(B),MAX(b) FROM t1 WHERE t1.a = 1;
 drop table t1;
+
+#
+# Test problem with BDB and lock tables with duplicate write.
+#
+
+create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb;
+insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
+LOCK TABLES t1 WRITE;
+--error 690
+insert into t1 values (99,1,2,'D'),(1,1,2,'D');
+select id from t1;
+select id from t1;
+UNLOCK TABLES;
+DROP TABLE t1;
+
+create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb;
+insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
+LOCK TABLES t1 WRITE;
+begin;
+--error 690
+insert into t1 values (99,1,2,'D'),(1,1,2,'D');
+select id from t1;
+insert ignore into t1 values (100,1,2,'D'),(1,1,99,'D');
+commit;
+select id,id3 from t1;
+UNLOCK TABLES;
+DROP TABLE t1;
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index edd3c1fff7e..e75841dc6d0 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -2,6 +2,7 @@
 # Test of group (Failed for Lars Hoss <lh@pbm.de>)
 #
 
+drop table if exists t1,t2;
 CREATE TABLE t1 (
   spID int(10) unsigned,
   userID int(10) unsigned,
@@ -208,3 +209,14 @@ select value,description,bug_id from t2 left join t1 on t2.program=t1.product an
 select value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value;
 
 drop table t1,t2;
+
+#
+# Problem with functions and group functions when no matching rows
+#
+
+create table t1 (foo int);
+insert into t1 values (1);
+select 1+1, "a",count(*) from t1 where foo in (2);
+insert into t1 values (1);
+select 1+1,"a",count(*) from t1 where foo in (2);
+drop table t1;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index b18091656b6..cef53ce8165 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -429,3 +429,50 @@ create table t1 (a int  primary key,b int, c int, d int, e int, f int, g int, h
 insert into t1 values (1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 explain select * from t1 where a > 0 and a < 50;
 drop table t1;
+
+#
+# Test lock tables
+#
+
+create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=innodb;
+insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
+LOCK TABLES t1 WRITE;
+--error 690
+insert into t1 values (99,1,2,'D'),(1,1,2,'D');
+select id from t1;
+select id from t1;
+UNLOCK TABLES;
+DROP TABLE t1;
+
+create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=innodb;
+insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');
+LOCK TABLES t1 WRITE;
+begin;
+--error 690
+insert into t1 values (99,1,2,'D'),(1,1,2,'D');
+select id from t1;
+insert ignore into t1 values (100,1,2,'D'),(1,1,99,'D');
+commit;
+select id,id3 from t1;
+UNLOCK TABLES;
+DROP TABLE t1;
+
+#
+# Test prefix key
+#
+--error 1089
+create table t1 (a char(20), unique (a(5))) type=innodb;
+create table t1 (a char(20), index (a(5))) type=innodb;
+show create table t1;
+drop table t1;
+
+#
+# Test using temporary table and auto_increment
+#
+
+create temporary table t1 (a int not null auto_increment, primary key(a)) type=innodb;
+insert into t1 values (NULL),(NULL),(NULL);
+delete from t1 where a=3;
+insert into t1 values (NULL);
+select * from t1;
+drop table t1;
diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test
index 777129ec814..385713174d2 100644
--- a/mysql-test/t/lock.test
+++ b/mysql-test/t/lock.test
@@ -21,3 +21,35 @@ LOCK TABLE t1 WRITE,t2 write;
 insert into t2 SELECT * from t1;
 update t1 set id=1 where id=-1;
 drop table t1,t2;
+
+
+#
+# Check bug with INSERT ... SELECT with lock tables
+#
+
+CREATE TABLE t1 (
+  index1 smallint(6) default NULL,
+  nr smallint(6) default NULL,
+  KEY index1(index1)
+) TYPE=MyISAM;
+
+CREATE TABLE t2 (
+  nr smallint(6) default NULL,
+  name varchar(20) default NULL
+) TYPE=MyISAM;
+
+INSERT INTO t2 VALUES (1,'item1');
+INSERT INTO t2 VALUES (2,'item2');
+
+# problem begins here!
+lock tables t1 write, t2 read;
+insert into t1 select 1,nr from t2 where name='item1';
+insert into t1 select 2,nr from t2 where name='item2';
+unlock tables;
+check table t1;
+
+# Check error message
+lock tables t1 write;
+check table t2;
+unlock tables;
+drop table t1,t2;
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index 34e160a760c..b501d63b10e 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -1,18 +1,21 @@
 source include/master-slave.inc;
-source include/have_default_master.inc;
 connection master;
 show master status;
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=173;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 show master status;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index 825d1317bbc..73a10bed7b3 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -1,6 +1,5 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0, mysql-slave.sock);
-source include/have_default_master.inc;
 connection master;
 reset master;
 show master status;
@@ -9,12 +8,15 @@ connection slave;
 reset slave;
 show slave status;
 change master to master_host='127.0.0.1';
+--replace_result 3306 9998 9306 9999 3334 9999 3335 9999
 show slave status;
 eval change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=$MASTER_MYPORT;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 drop table if exists t1;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index a1450089898..7b46bc75498 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -1,6 +1,5 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0,mysql-slave.sock);
-source include/have_default_master.inc;
 system cat /dev/null > var/slave-data/master.info;
 system chmod 000 var/slave-data/master.info;
 connection slave;
@@ -23,6 +22,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t1;
 connection master;
@@ -68,6 +68,7 @@ insert into t2 values (65);
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t2;
 connection master;
@@ -87,6 +88,7 @@ connection slave;
 slave stop;
 slave start;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 # because of concurrent insert, the table may not be up to date
 # if we do not lock
diff --git a/mysql-test/t/rpl000018-master.sh b/mysql-test/t/rpl000018-master.sh
index 71f0f12d0c5..e570f106ec6 100755
--- a/mysql-test/t/rpl000018-master.sh
+++ b/mysql-test/t/rpl000018-master.sh
@@ -1,3 +1,3 @@
-rm -f $MYSQL_TEST_DIR/var/lib/master-bin.* 
-cp $MYSQL_TEST_DIR/std_data/master-bin.001  $MYSQL_TEST_DIR/var/lib/
-echo ./master-bin.001 >  $MYSQL_TEST_DIR/var/lib/master-bin.index
+rm -f $MYSQL_TEST_DIR/var/master-data/master-bin.* 
+cp $MYSQL_TEST_DIR/std_data/master-bin.001  $MYSQL_TEST_DIR/var/master-data/
+echo ./master-bin.001 >  $MYSQL_TEST_DIR/var/master-data/master-bin.index
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index d4be1a6d25a..f4f58c8c885 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -48,3 +48,20 @@ show index from t1;
 repair table t1;
 show index from t1;
 drop table t1;
+
+#
+# Test of SHOW CREATE
+#
+
+create temporary table t1 (a int not null);
+show create table t1;
+alter table t1 rename t2;
+show create table t2;
+drop table t2;
+
+create table t1 (
+  test_set set( 'val1', 'val2', 'val3' ) not null default '',
+  name char(20) default 'O''Brien'
+  ) comment = 'it\'s a table' ;
+show create table t1 ;
+drop table t1;
diff --git a/mysql-test/t/shw000001.test b/mysql-test/t/shw000001.test
deleted file mode 100644
index 6b24d8a44c7..00000000000
--- a/mysql-test/t/shw000001.test
+++ /dev/null
@@ -1,8 +0,0 @@
-use test;
-drop table if exists t1;
-create table t1 (
-  test_set set( 'val1', 'val2', 'val3' ) not null default '',
-  name char(20) default 'O''Brien'
-  ) comment = 'it\'s a table' ;
-show create table t1 ;
-drop table t1;