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.

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
 };

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;