diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-04-18 20:47:55 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-04-18 20:47:55 -0600 |
| commit | c6e95257b5953185ae89784095201d67ad35a017 (patch) | |
| tree | 4a83efb2015204757285cc7c9df9e9c1cecf9c14 /client/client_priv.h | |
| parent | 88cd33335451f1355620aad8751552313b3b0154 (diff) | |
| download | mariadb-git-c6e95257b5953185ae89784095201d67ad35a017.tar.gz | |
Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and
include client_priv.h in mysqltest.c. Portability fix.
client/client_priv.h:
Include client_priv.h, for WEXITSTATUS definition.
Remove code which is already in client_priv.h.
Rearrange OPT_* enum to co-exist with options defined in client_priv.h.
client/mysqltest.c:
Move WEXITSTATUS #define from mysqltest.c to client_priv.h, as it is
useful in other clients (in particular, current mysql_upgrade.c won't
compile without it on some platforms).
Add a final OPT_MAX_CLIENT_OPTION to enum options_client, which can
be used when a maximum shared client option value is needed.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 11 |
1 files changed, 10 insertions, 1 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 }; |