- Fixed some option types in my_getopt struct in all clients.

- Added special option/variable prefix '--loose-' to my_getopt.c


client/mysql.cc:
  Fixed some variable types.
client/mysqladmin.c:
  Fixed some variable types.
client/mysqlcheck.c:
  Fixed some variable types.
client/mysqldump.c:
  Fixed some variable types.
client/mysqlimport.c:
  Fixed some variable types.
client/mysqlshow.c:
  Fixed some variable types.
myisam/myisamchk.c:
  Fixed some variable types.
mysys/my_getopt.c:
  Fixed a bug in noticing whether argument was allowed to option (variable).
  Added support for prefix --loose-option-name
  This will work with options and variables, but not with --set-variable (!)
  --set-variable is depricated and --variable-name=value should be used
  instead. When used, my_getopt will not return error if option/variable
  was not found, but print a warning, do a no-op and continue.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 9 insertions, 8 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 7e05e777acd..a9422fbba78 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -35,7 +35,7 @@
 ** and adapted to mysqldump 05/11/01 by Jani Tolonen
 */
 
-#define DUMP_VERSION "9.02"
+#define DUMP_VERSION "9.03"
 
 #include <my_global.h>
 #include <my_sys.h>
@@ -192,8 +192,9 @@ static struct my_option my_long_options[] =
   {"pipe", 'W', "Use named pipes to connect to server", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-  {"port", 'P', "Port number to use for connection.", 0, 0, 0, GET_LONG,
-   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
+   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   0},
   {"quick", 'q', "Don't buffer query, dump directly to stdout.",
    (gptr*) &quick, (gptr*) &quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"quote-names",'Q', "Quote table and column names with a `",
@@ -224,15 +225,15 @@ static struct my_option my_long_options[] =
    (gptr*) &where, (gptr*) &where, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"xml", 'X', "Dump a database as well formed XML.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-  { "max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",
+  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",
     (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0,
-    GET_LONG, REQUIRED_ARG, 24*1024*1024, 4096, 512*1024L*1024L,
+    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 512*1024L*1024L,
     MALLOC_OVERHEAD, 1024, 0},
-  { "net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
+  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
     (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0,
-    GET_LONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,
+    GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,
     MALLOC_OVERHEAD-1024, 1024, 0},
-  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
 static const char *load_default_groups[]= { "mysqldump","client",0 };