diff options
| author | tsmith@siva.hindu.god <> | 2007-04-18 20:47:55 -0600 |
|---|---|---|
| committer | tsmith@siva.hindu.god <> | 2007-04-18 20:47:55 -0600 |
| commit | 041c8a825fd39d4877eae7731cede70b7a48b34e (patch) | |
| tree | 4a83efb2015204757285cc7c9df9e9c1cecf9c14 /client | |
| parent | 68f2cc2906e1335fc33b79e460c50297e3809b9d (diff) | |
| download | mariadb-git-041c8a825fd39d4877eae7731cede70b7a48b34e.tar.gz | |
Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and
include client_priv.h in mysqltest.c. Portability fix.
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 11 | ||||
| -rw-r--r-- | client/mysqltest.c | 16 |
2 files changed, 13 insertions, 14 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index ddc0e50b723..25241cc8c59 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -23,6 +23,14 @@ #include <errmsg.h> #include <my_getopt.h> +#ifndef WEXITSTATUS +# ifdef __WIN__ +# define WEXITSTATUS(stat_val) (stat_val) +# else +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# endif +#endif + enum options_client { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, @@ -67,5 +75,6 @@ enum options_client OPT_SLAP_POST_QUERY, OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID, OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT, - OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG + OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG, + OPT_MAX_CLIENT_OPTION }; diff --git a/client/mysqltest.c b/client/mysqltest.c index c36adaa8db6..839e8cd9a43 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -52,14 +52,6 @@ #include <sys/wait.h> #endif -#ifndef WEXITSTATUS -# ifdef __WIN__ -# define WEXITSTATUS(stat_val) (stat_val) -# else -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -# endif -#endif - /* Use cygwin for --exec and --system before 5.0 */ #if MYSQL_VERSION_ID < 50000 #define USE_CYGWIN @@ -81,11 +73,9 @@ }; enum { - OPT_SKIP_SAFEMALLOC=256, OPT_SSL_SSL, OPT_SSL_KEY, OPT_SSL_CERT, - OPT_SSL_CA, OPT_SSL_CAPATH, OPT_SSL_CIPHER, OPT_PS_PROTOCOL, - OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, - OPT_SSL_VERIFY_SERVER_CERT, OPT_MAX_CONNECT_RETRIES, - OPT_MARK_PROGRESS, OPT_CHARSETS_DIR, OPT_LOG_DIR + OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION, + OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, + OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR }; static int record= 0, opt_sleep= -1; |