bk commit into 4.1 tree (msvensson:1.2591)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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, 2007-01-17 11:27:33+01:00, msvensson@stripped +2 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060825084614|09755

  mysql-test/r/myisam.result@stripped, 2007-01-17 11:27:33+01:00, msvensson@stripped +0 -0
    Exclude

  mysql-test/t/myisam.test@stripped, 2007-01-17 11:27:33+01:00, msvensson@stripped +0 -0
    Exclude

# 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:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-4.1-engines

--- 1.69/mysql-test/r/myisam.result	2006-12-20 16:05:34 +01:00
+++ 1.70/mysql-test/r/myisam.result	2007-01-17 11:27:33 +01:00
@@ -927,12 +927,12 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show create table t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t1 (a int) engine=myisam select 42 a;
 select * from t1;
 a

--- 1.55/mysql-test/t/myisam.test	2006-12-20 16:05:34 +01:00
+++ 1.56/mysql-test/t/myisam.test	2007-01-17 11:27:33 +01:00
@@ -861,20 +861,14 @@
 
 connection session1;
 disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 9 a;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" select 9 a;
 enable_query_log;
-# If running test suite with a non standard tmp dir, the "show create table"
-# will print "DATA_DIRECTORY=". Use replace_result to mask it out
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 show create table t1;
 
 connection session2;
 disable_query_log;
-eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a;
+eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" select 99 a;
 enable_query_log;
-# If running test suite with a non standard tmp dir, the "show create table"
-# will print "DATA_DIRECTORY=". Use replace_result to mask it out
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 show create table t1;
 
 connection default;