Commit 5cda5240 authored by unknown's avatar unknown

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
parents 803d77f8 38c28141
...@@ -5490,6 +5490,7 @@ void init_win_path_patterns() ...@@ -5490,6 +5490,7 @@ void init_win_path_patterns()
const char* paths[] = { "$MYSQL_TEST_DIR", const char* paths[] = { "$MYSQL_TEST_DIR",
"$MYSQL_TMP_DIR", "$MYSQL_TMP_DIR",
"$MYSQLTEST_VARDIR", "$MYSQLTEST_VARDIR",
"$MASTER_MYSOCK",
"./test/" }; "./test/" };
int num_paths= sizeof(paths)/sizeof(char*); int num_paths= sizeof(paths)/sizeof(char*);
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment