Merge

BUILD/FINISH.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/r/create.result:
  Merge changes
mysql-test/r/temp_table.result:
  SCCS merged
mysql-test/t/temp_table.test:
  Merge new tests
sql/item.cc:
  Merge from 4.1
sql/sql_select.cc:
  Merge from 4.1

1 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/t/temp_table.test b/mysql-test/t/temp_table.test
index eeb33515570..da7ce9b4722 100644
--- a/mysql-test/t/temp_table.test
+++ b/mysql-test/t/temp_table.test
@@ -104,3 +104,11 @@ drop table t1;
 select * from t1;
 drop view 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;