diff options
author | unknown <msvensson@neptunus.(none)> | 2005-06-27 15:14:23 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-06-27 15:14:23 +0200 |
commit | cbc105087ccb64600aa248a90f09831e42b512a3 (patch) | |
tree | 738454afe45415777d6cd8bd8c1b4d1e67449e83 /client | |
parent | fde3b9518ccd98018412ee8fa310f02b6f7b48d7 (diff) | |
parent | e00981bb5ff6d310e411fc58acc1369e0899285b (diff) | |
download | mariadb-git-cbc105087ccb64600aa248a90f09831e42b512a3.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 0ddd73b433e..7fdaf1098c2 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -60,7 +60,7 @@ #include <sys/stat.h> #include <violite.h> #include <regex.h> /* Our own version of lib */ -#include <stdlib.h> +#include <sys/wait.h> #define MAX_QUERY 131072 #define MAX_VAR_NAME 256 #define MAX_COLUMNS 256 |