From f183c08476ce39bb8e8b82912de1e85ee95ced58 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.local" <>
Date: Mon, 10 Jul 2006 14:53:49 +0400
Subject: [PATCH] A post-merge fix (Bug#8706 "temporary table with data
 directory option fails"

---
 mysql-test/t/myisam.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index a465a381676..695d0b02b37 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -850,13 +850,13 @@ connect (session2,localhost,root,,);
 
 connection session1;
 disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" select 9 a;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 9 a;
 enable_query_log;
 show create table t1;
 
 connection session2;
 disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" select 99 a;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 99 a;
 enable_query_log;
 show create table t1;