Commit 4945fd4a authored by jani@dsl-jkl1657.dial.inet.fi's avatar jani@dsl-jkl1657.dial.inet.fi
Browse files

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

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

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ tonu@x3.internalnet 
venu@work.mysql.com

zak@balfor.local

zak@linux.local

jani@dsl-jkl1657.dial.inet.fi

client/mysql.cc

+10 −9
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER= "12.3";

const char *VER= "12.4";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -524,8 +524,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},

  {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.", 0, 0, 0,

   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"quick", 'q',
@@ -562,19 +563,19 @@ static struct my_option my_long_options[] = 
  {"wait", 'w', "Wait and retry if connection is down.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout,

   (gptr*) &opt_connect_timeout, 0, GET_LONG, REQUIRED_ARG, 0, 0, 3600*12, 0,

   (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 3600*12, 0,

   0, 1},

  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",

   (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0, GET_LONG,

   (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0, GET_ULONG,

   REQUIRED_ARG, 16 *1024L*1024L, 4096, 512*1024L*1024L, MALLOC_OVERHEAD,

   1024, 0},

  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",

   (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0, GET_LONG,

   (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0, GET_ULONG,

   REQUIRED_ARG, 16384, 1024, 512*1024*1024L, MALLOC_OVERHEAD, 1024, 0},

  {"select_limit", OPT_SELECT_LIMIT, "", (gptr*) &select_limit,

   (gptr*) &select_limit, 0, GET_LONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},

   (gptr*) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},

  {"max_join_size", OPT_MAX_JOIN_SIZE, "", (gptr*) &max_join_size,

   (gptr*) &max_join_size, 0, GET_LONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,

   (gptr*) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,

   0},

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};

client/mysqladmin.c

+7 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <my_pthread.h>				/* because of signal()	*/

#endif



#define ADMIN_VERSION "8.30"

#define ADMIN_VERSION "8.31"

#define MAX_MYSQL_VAR 64

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -124,8 +124,8 @@ 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*) &tcp_port,

   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"relative", 'r',

   "Show difference between current and previous values when used with -i. Currently works only with extended-status.",

   (gptr*) &opt_relative, (gptr*) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
@@ -138,7 +138,8 @@ static struct my_option my_long_options[] = 
  {"socket", 'S', "Socket file to use for connection.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"sleep", 'i', "Execute commands again and again with a sleep between.",

   0, 0, 0, GET_LONG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

   (gptr*) &interval, (gptr*) &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,

   0, 0},

#include "sslopt-longopts.h"

#ifndef DONT_ALLOW_USER_CHANGE

  {"user", 'u', "User for login if not current user.", (gptr*) &user,
@@ -155,10 +156,10 @@ static struct my_option my_long_options[] = 
  {"wait", 'w', "Wait and retry if connection is down", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout,

   (gptr*) &opt_connect_timeout, 0, GET_LONG, REQUIRED_ARG, 3600*12, 0,

   (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0,

   3600*12, 0, 1, 0},

  {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (gptr*) &opt_shutdown_timeout,

   (gptr*) &opt_shutdown_timeout, 0, GET_LONG, REQUIRED_ARG,

   (gptr*) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,

   SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};

client/mysqlcheck.c

+4 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* By Jani Tolonen, 2001-04-20, MySQL Development Team */



#define CHECK_VERSION "2.0"

#define CHECK_VERSION "2.1"



#include "client_priv.h"

#include <my_getopt.h>
@@ -107,8 +107,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',

   "If you are using this option with CHECK TABLE, it prevents the check from scanning the rows to check for wrong links. This is the fastest check. If you are using this option with REPAIR TABLE, it will try to repair only the index tree. This is the fastest repair method for a table.",

   (gptr*) &opt_quick, (gptr*) &opt_quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,

client/mysqldump.c

+9 −8
Original line number Diff line number Diff line
@@ -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 `",
@@ -226,11 +227,11 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"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, "",

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

};