summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-07-01 15:40:29 +0200
committerunknown <msvensson@neptunus.(none)>2005-07-01 15:40:29 +0200
commit012f6be80939e4f39b145f4fa7f33b437a795db9 (patch)
tree7f76cc9d55d8e066d7eab9774fe2e281fadaeb0f
parent0ff72e6019d8f9deec9159db87cf7947142539b3 (diff)
parentd305f6d3ce4e1e09b9e7e02836f20da3faa9dfe1 (diff)
downloadmariadb-git-012f6be80939e4f39b145f4fa7f33b437a795db9.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 client/mysqltest.c: Auto merged
-rw-r--r--client/mysqltest.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 87c34591b89..b7f4ceb9c20 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