From: Date: July 10 2006 12:53pm
Subject: bk commit into 5.0 tree (kostja:1.2226) BUG#8706
List-Archive: http://lists.mysql.com/commits/8986
X-Bug: 8706
Message-Id: <20060710105356.D25551089@bodhi.local>

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-10 14:53:49+04:00, kostja@stripped +1 -0
  A post-merge fix (Bug#8706 "temporary table with data directory option 
  fails"

  mysql-test/t/myisam.test@stripped, 2006-07-10 14:53:47+04:00, kostja@stripped +2 -2
    Fix myisam.test to work with non-default mysqltest var directory.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime-merge-41

--- 1.59/mysql-test/t/myisam.test	2006-07-10 14:53:56 +04:00
+++ 1.60/mysql-test/t/myisam.test	2006-07-10 14:53:56 +04:00
@@ -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;