Commit 15bed7c5 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
parents 54e0c92d 399617ef

client/mysqltest.c

+4 −2
Original line number Diff line number Diff line
@@ -3093,8 +3093,10 @@ DYNAMIC_ARRAY patterns; 
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;

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ sub environment_setup () { 
  $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'};

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ SYST=0 
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