Commit 55d6d04d authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/misc/mysql/31177/50-31177
parents 3900e55a 31d4e58a

client/mysql.cc

+7 −6
Original line number Diff line number Diff line
@@ -742,9 +742,9 @@ static struct my_option my_long_options[] = 
   0, 1},

  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET,

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

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

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

   MALLOC_OVERHEAD, 1024, 0},

   (gptr*) &opt_max_allowed_packet, (gptr*) &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",

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

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

   (gptr*) &select_limit,

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

   (gptr*) &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",

   (gptr*) &max_join_size,

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

   0},

   (gptr*) &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", (gptr*) &opt_secure_auth,

    (gptr*) &opt_secure_auth, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -4986,7 +4986,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.",

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

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

   0, 0, 0},

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

   (gptr*) &unix_sock, (gptr*) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,

include/m_string.h

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,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

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ extern void my_print_variables(const struct my_option *options); 
extern void my_getopt_register_get_addr(gptr* (*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 *fixed);

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



C_MODE_END

mysql-test/r/delayed.result

+16 −0
Original line number Diff line number Diff line
@@ -109,12 +109,20 @@ c1 
DROP TABLE t1;

SET             @@auto_increment_offset=

@bug20627_old_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@auto_increment_increment=

@bug20627_old_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET             @@session.auto_increment_offset=

@bug20627_old_session_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@session.auto_increment_increment=

@bug20627_old_session_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET @bug20830_old_auto_increment_offset=

@@auto_increment_offset= 2;

SET @bug20830_old_auto_increment_increment=
@@ -237,12 +245,20 @@ SUM(c1) 
DROP TABLE t1;

SET             @@auto_increment_offset=

@bug20830_old_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@auto_increment_increment=

@bug20830_old_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET             @@session.auto_increment_offset=

@bug20830_old_session_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@session.auto_increment_increment=

@bug20830_old_session_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

CREATE TABLE t1(a BIT);

INSERT DELAYED INTO t1 VALUES(1);

FLUSH TABLE t1;