summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <pcrews@pcrews-mac-local.local>2008-05-01 11:58:39 -0400
committerunknown <pcrews@pcrews-mac-local.local>2008-05-01 11:58:39 -0400
commitb837c420413e97105925a605b1d58845beb6a973 (patch)
treecffb1c80aa31d64243c7a69c3a0785b69c2a4f24 /client/mysqltest.c
parent6ef8efd4d5f758bce57a9d694f98e8c6aee22910 (diff)
parent5cda5240a6d2cac405bd5966f2de45b602433916 (diff)
downloadmariadb-git-b837c420413e97105925a605b1d58845beb6a973.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs client/mysqltest.c: Auto merged
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 3f24d23a13f..0360a8e4ba9 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -5490,6 +5490,7 @@ void init_win_path_patterns()
const char* paths[] = { "$MYSQL_TEST_DIR",
"$MYSQL_TMP_DIR",
"$MYSQLTEST_VARDIR",
+ "$MASTER_MYSOCK",
"./test/" };
int num_paths= sizeof(paths)/sizeof(char*);
int i;