Commit 0f27fa86 authored by unknown's avatar unknown

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

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


client/mysqltest.c:
  Auto merged
parents 4cd2aa73 fba971f5
...@@ -4140,7 +4140,7 @@ void init_win_path_patterns() ...@@ -4140,7 +4140,7 @@ void init_win_path_patterns()
"$MYSQL_TMP_DIR", "$MYSQL_TMP_DIR",
"$MYSQLTEST_VARDIR", "$MYSQLTEST_VARDIR",
"./test/" }; "./test/" };
int num_paths= sizeof(paths)/sizeof(char*), int num_paths= sizeof(paths)/sizeof(char*);
int i; int i;
char* p; char* p;
......
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