bk commit into 5.1 tree (msvensson:1.2167)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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
  1.2167 06/02/26 19:55:12 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_win/my50-mysqltest_win
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_win/my51-mysqltest_win

  mysql-test/mysql-test-run.sh
    1.302 06/02/26 19:55:06 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.75 06/02/26 19:55:06 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.189 06/02/26 19:55:06 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysqltest_win/my51-mysqltest_win/RESYNC

--- 1.301/mysql-test/mysql-test-run.sh	2006-02-17 21:25:36 +01:00
+++ 1.302/mysql-test/mysql-test-run.sh	2006-02-26 19:55:06 +01:00
@@ -202,6 +202,7 @@
 REALT=0
 FAST_START=""
 MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
+export MYSQL_TMP_DIR
 
 # Use a relative path for where the slave will find the dumps
 # generated by "LOAD DATA" on the master. The path is relative

--- 1.74/mysql-test/mysql-test-run.pl	2006-02-23 10:49:35 +01:00
+++ 1.75/mysql-test/mysql-test-run.pl	2006-02-26 19:55:06 +01:00
@@ -1156,6 +1156,7 @@
   $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
   $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
+  $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_mysock'};
   $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_mysock'};
   $ENV{'MASTER_MYPORT'}=      $master->[0]->{'path_myport'};

--- 1.188/client/mysqltest.c	2006-02-23 20:55:54 +01:00
+++ 1.189/client/mysqltest.c	2006-02-26 19:55:06 +01:00
@@ -3662,8 +3662,10 @@
 static void init_win_path_patterns()
 {
   /* List of string patterns to match in order to find paths */
-  const char* paths[] = { "$MYSQL_TEST_DIR", "./test/", 0 };
-  int num_paths= 2;
+  const char* paths[] = { "$MYSQL_TEST_DIR",
+                          "$MYSQL_TMP_DIR",
+                          "./test/", 0 };
+  int num_paths= 3;
   int i;
   char* p;