1 files changed, 21 insertions, 8 deletions
diff --git a/mysql-test/t/temp_table.test b/mysql-test/t/temp_table.test
index 665e690a322..309855d0b2d 100644
--- a/mysql-test/t/temp_table.test
+++ b/mysql-test/t/temp_table.test
@@ -2,7 +2,10 @@
 # Test of temporary tables
 #
 
+--disable_warnings
 drop table if exists t1,t2;
+--enable_warnings
+
 CREATE TABLE t1 (c int not null, d char (10) not null);
 insert into t1 values(1,""),(2,"a"),(3,"b");
 CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
@@ -13,12 +16,14 @@ select * from t2;
 CREATE TABLE t2 (x int not null, y int not null);
 alter table t2 rename t1;
 select * from t1;
-create TEMPORARY TABLE t2 type=heap select * from t1;
-create TEMPORARY TABLE IF NOT EXISTS t2 (a int) type=heap;
+create TEMPORARY TABLE t2 engine=heap select * from t1;
+create TEMPORARY TABLE IF NOT EXISTS t2 (a int) engine=heap;
 
 # This should give errors
-!$1050 CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
-!$1050 ALTER TABLE t1 RENAME t2;
+--error 1050
+CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
+--error 1050
+ALTER TABLE t1 RENAME t2;
 
 select * from t2;
 alter table t2 add primary key (a,b);
@@ -34,7 +39,6 @@ drop table t1;
 # Test CONCAT_WS with temporary tables
 #
 
-drop table if exists t1;
 CREATE TABLE t1 (pkCrash INTEGER PRIMARY KEY,strCrash VARCHAR(255));
 INSERT INTO t1 ( pkCrash, strCrash ) VALUES ( 1, '1');
 SELECT CONCAT_WS(pkCrash, strCrash) FROM t1;
@@ -74,11 +78,9 @@ drop table t1;
 # In MySQL 4.0.4 doing a GROUP BY on a NULL column created a disk based
 # temporary table when a memory based one would be good enough.
 
-drop table if exists t1;
-
 CREATE TABLE t1 (
   d datetime default NULL
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 
 INSERT INTO t1 VALUES ('2002-10-24 14:50:32'),('2002-10-24 14:50:33'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40');
@@ -87,3 +89,14 @@ flush status;
 select * from t1 group by d;
 show status like "created_tmp%tables";
 drop table t1;
+
+# Bug #8497: tmpdir with extra slashes would cause failures
+#
+create table t1 (a int, b int, index(a), index(b));
+create table t2 (c int auto_increment, d varchar(255), primary key (c));
+insert into t1 values (3,1),(3,2);
+insert into t2 values (NULL, 'foo'), (NULL, 'bar');
+select d, c from t1 left join t2 on b = c where a = 3 order by d;
+drop table t1, t2;
+
+# End of 4.1 tests