Commit af73c6c8 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M51/mysql-5.1 

into  trift2.:/MySQL/M51/push-5.1
parents 6bb288b6 16f0bd71

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -3009,5 +3009,6 @@ vio/viotest.cpp 
win/configure.data

win/vs71cache.txt

win/vs8cache.txt

ylwrap

zlib/*.ds?

zlib/*.vcproj

client/mysql.cc

+11 −10
Original line number Diff line number Diff line
@@ -605,6 +605,10 @@ static struct my_option my_long_options[] = 
  {"column-type-info", OPT_COLUMN_TYPES, "Display column type information.",

   (uchar**) &column_types_flag, (uchar**) &column_types_flag,

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

  {"comments", 'c', "Preserve comments. Send comments to the server."

   " The default is --skip-comments (discard comments), enable with --comments",

   (uchar**) &preserve_comments, (uchar**) &preserve_comments,

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

  {"compress", 'C', "Use compression in server/client protocol.",

   (uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},
@@ -755,9 +759,9 @@ static struct my_option my_long_options[] = 
   0, 0},

  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET,

   "Max packet length to send to, or receive from server",

   (uchar**) &opt_max_allowed_packet, (uchar**) &opt_max_allowed_packet, 0, GET_ULONG,

   REQUIRED_ARG, 16 *1024L*1024L, 4096, (longlong) 2*1024L*1024L*1024L,

   MALLOC_OVERHEAD, 1024, 0},

   (uchar**) &opt_max_allowed_packet, (uchar**) &opt_max_allowed_packet, 0,

   GET_ULONG, REQUIRED_ARG, 16 *1024L*1024L, 4096,

   (longlong) 2*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},

  {"net_buffer_length", OPT_NET_BUFFER_LENGTH,

   "Buffer for TCP/IP and socket communication",

   (uchar**) &opt_net_buffer_length, (uchar**) &opt_net_buffer_length, 0, GET_ULONG,
@@ -765,12 +769,13 @@ static struct my_option my_long_options[] = 
  {"select_limit", OPT_SELECT_LIMIT,

   "Automatic limit for SELECT when using --safe-updates",

   (uchar**) &select_limit,

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

   (uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ULONG_MAX,

   0, 1, 0},

  {"max_join_size", OPT_MAX_JOIN_SIZE,

   "Automatic limit for rows in a join when using --safe-updates",

   (uchar**) &max_join_size,

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

   0},

   (uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ULONG_MAX,

   0, 1, 0},

  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"

    " uses old (pre-4.1.1) protocol", (uchar**) &opt_secure_auth,

    (uchar**) &opt_secure_auth, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -779,10 +784,6 @@ static struct my_option my_long_options[] = 
  {"show-warnings", OPT_SHOW_WARNINGS, "Show warnings after every statement.",

    (uchar**) &show_warnings, (uchar**) &show_warnings, 0, GET_BOOL, NO_ARG, 

    0, 0, 0, 0, 0, 0},

  {"comments", 'c', "Preserve comments. Send comments to the server."

   " Comments are discarded by default, enable with --enable-comments",

   (uchar**) &preserve_comments, (uchar**) &preserve_comments,

   0, GET_BOOL, 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}

};

client/mysqltest.c

+1 −2
Original line number Diff line number Diff line
@@ -5050,7 +5050,7 @@ static struct my_option my_long_options[] = 
   "Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG,

   0, 0, 0, 0, 0, 0},

  {"sleep", 'T', "Sleep always this many seconds on sleep commands.",

   (uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, 0, 0,

   (uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, -1, 0,

   0, 0, 0},

  {"socket", 'S', "Socket file to use for connection.",

   (uchar**) &unix_sock, (uchar**) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
@@ -8018,7 +8018,6 @@ REPLACE *init_replace(char * *from, char * *to,uint count, 
    if (!len)

    {

      errno=EINVAL;

      my_message(0,"No to-string for last from-string",MYF(ME_BELL));

      DBUG_RETURN(0);

    }

    states+=len+1;

include/m_string.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ double my_strtod(const char *str, char **end, int *error); 
double my_atof(const char *nptr);



extern char *llstr(longlong value,char *buff);

extern char *ullstr(longlong value,char *buff);

#ifndef HAVE_STRTOUL

extern long strtol(const char *str, char **ptr, int base);

extern ulong strtoul(const char *str, char **ptr, int base);

include/my_getopt.h

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ extern void my_print_variables(const struct my_option *options); 
extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint,

							   const struct my_option *));



ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp);

ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,

                                 bool *fix);

longlong getopt_ll_limit_value(longlong, const struct my_option *,bool *fix);

my_bool getopt_compare_strings(const char *s, const char *t, uint length);



C_MODE_END