summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-07-01 16:13:05 +0200
committerunknown <lars@mysql.com>2005-07-01 16:13:05 +0200
commit799ea10e240dd2d968987de41a4fa16a6b028377 (patch)
tree03afb297cb4a5eed44a10ac476e1ced2aebe2b5d
parentf20c899892d8b8a453a3d54c5b29c93235804a01 (diff)
parent012f6be80939e4f39b145f4fa7f33b437a795db9 (diff)
downloadmariadb-git-799ea10e240dd2d968987de41a4fa16a6b028377.tar.gz
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
-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