summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-02-26 19:54:09 +0100
committerunknown <msvensson@neptunus.(none)>2006-02-26 19:54:09 +0100
commit399617efe6ef5c861cedc6501acff6235e77d3c6 (patch)
tree2294ca1357f8b4ae339969f95d2f8e11d2e6f0e0 /client/mysqltest.c
parentef1316fadda7b7d8c1b00de6d82576ebc21607cc (diff)
downloadmariadb-git-399617efe6ef5c861cedc6501acff6235e77d3c6.tar.gz
Look for and "convert" paths that start with $MYSQL_TMP_DIR
client/mysqltest.c: Also look for "$MYSQL_TMP_DIR" when looking for paths to convert mysql-test/mysql-test-run.pl: Export $MYSQL_TMP_DIR mysql-test/mysql-test-run.sh: Export $MYSQL_TMP_DIR
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 7f5ded13d62..9aedee8aa30 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -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;