diff options
author | unknown <msvensson@neptunus.(none)> | 2005-07-01 15:40:42 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-07-01 15:40:42 +0200 |
commit | a58edfc5bffd03fa48f0d1bfbe40450f280c4f42 (patch) | |
tree | 7aac0c62106b76ca6ea755dadb7d36ed78c66ac2 | |
parent | eb4cb6eba3147b271d893354465e9b2b44addd20 (diff) | |
parent | d305f6d3ce4e1e09b9e7e02836f20da3faa9dfe1 (diff) | |
download | mariadb-git-a58edfc5bffd03fa48f0d1bfbe40450f280c4f42.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
-rw-r--r-- | client/mysqltest.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index a7f9420df6d..65f8c9358c2 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -60,7 +60,12 @@ #include <sys/stat.h> #include <violite.h> #include <regex.h> /* Our own version of lib */ +#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> +#endif +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif #define MAX_QUERY 131072 #define MAX_VAR_NAME 256 #define MAX_COLUMNS 256 |