diff options
author | unknown <pcrews@pcrews-mac-local.local> | 2008-05-01 11:37:34 -0400 |
---|---|---|
committer | unknown <pcrews@pcrews-mac-local.local> | 2008-05-01 11:37:34 -0400 |
commit | 5cda5240a6d2cac405bd5966f2de45b602433916 (patch) | |
tree | b331896e984947579e0240e65a13d86223a5c937 /client/mysqltest.c | |
parent | 803d77f84f119dc72226dcb040473bd7ce4b4bb5 (diff) | |
parent | 38c28141a88c1aac5642ef8ad444e12850582697 (diff) | |
download | mariadb-git-5cda5240a6d2cac405bd5966f2de45b602433916.tar.gz |
Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index c678f5e714d..a86bc3e7c3a 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; |