Skip to content

Commit 9598ea4

Browse files
author
[email protected]
committed
Merge mysql.com:/misc/mysql/31177/50-31177
into mysql.com:/misc/mysql/31177/51-31177
2 parents 69ed192 + 31d4e58 commit 9598ea4

19 files changed

+245
-95
lines changed

‎client/mysql.cc‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,22 +754,23 @@ static struct my_option my_long_options[] =
754754
0, 0},
755755
{"max_allowed_packet", OPT_MAX_ALLOWED_PACKET,
756756
"Max packet length to send to, or receive from server",
757-
(uchar**) &opt_max_allowed_packet, (uchar**) &opt_max_allowed_packet, 0, GET_ULONG,
758-
REQUIRED_ARG, 16 *1024L*1024L, 4096, (longlong) 2*1024L*1024L*1024L,
759-
MALLOC_OVERHEAD, 1024, 0},
757+
(uchar**) &opt_max_allowed_packet, (uchar**) &opt_max_allowed_packet, 0,
758+
GET_ULONG, REQUIRED_ARG, 16 *1024L*1024L, 4096,
759+
(longlong) 2*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
760760
{"net_buffer_length", OPT_NET_BUFFER_LENGTH,
761761
"Buffer for TCP/IP and socket communication",
762762
(uchar**) &opt_net_buffer_length, (uchar**) &opt_net_buffer_length, 0, GET_ULONG,
763763
REQUIRED_ARG, 16384, 1024, 512*1024*1024L, MALLOC_OVERHEAD, 1024, 0},
764764
{"select_limit", OPT_SELECT_LIMIT,
765765
"Automatic limit for SELECT when using --safe-updates",
766766
(uchar**) &select_limit,
767-
(uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
767+
(uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ULONG_MAX,
768+
0, 1, 0},
768769
{"max_join_size", OPT_MAX_JOIN_SIZE,
769770
"Automatic limit for rows in a join when using --safe-updates",
770771
(uchar**) &max_join_size,
771-
(uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,
772-
0},
772+
(uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ULONG_MAX,
773+
0, 1, 0},
773774
{"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
774775
" uses old (pre-4.1.1) protocol", (uchar**) &opt_secure_auth,
775776
(uchar**) &opt_secure_auth, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

‎client/mysqltest.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5050,7 +5050,7 @@ static struct my_option my_long_options[] =
50505050
"Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG,
50515051
0, 0, 0, 0, 0, 0},
50525052
{"sleep", 'T', "Sleep always this many seconds on sleep commands.",
5053-
(uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, 0, 0,
5053+
(uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, -1, 0,
50545054
0, 0, 0},
50555055
{"socket", 'S', "Socket file to use for connection.",
50565056
(uchar**) &unix_sock, (uchar**) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,

‎include/m_string.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ double my_strtod(const char *str, char **end, int *error);
200200
double my_atof(const char *nptr);
201201

202202
extern char *llstr(longlong value,char *buff);
203+
extern char *ullstr(longlong value,char *buff);
203204
#ifndef HAVE_STRTOUL
204205
extern long strtol(const char *str, char **ptr, int base);
205206
extern ulong strtoul(const char *str, char **ptr, int base);

‎include/my_getopt.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ extern void my_print_variables(const struct my_option *options);
7474
extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint,
7575
const struct my_option *));
7676

77-
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp);
77+
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
78+
bool *fixed);
7879
my_bool getopt_compare_strings(const char *s, const char *t, uint length);
7980

8081
C_MODE_END

‎mysql-test/r/delayed.result‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,20 @@ c1
109109
DROP TABLE t1;
110110
SET @@auto_increment_offset=
111111
@bug20627_old_auto_increment_offset;
112+
Warnings:
113+
Warning 1292 Truncated incorrect auto-increment-offset value: '0'
112114
SET @@auto_increment_increment=
113115
@bug20627_old_auto_increment_increment;
116+
Warnings:
117+
Warning 1292 Truncated incorrect auto-increment-increment value: '0'
114118
SET @@session.auto_increment_offset=
115119
@bug20627_old_session_auto_increment_offset;
120+
Warnings:
121+
Warning 1292 Truncated incorrect auto-increment-offset value: '0'
116122
SET @@session.auto_increment_increment=
117123
@bug20627_old_session_auto_increment_increment;
124+
Warnings:
125+
Warning 1292 Truncated incorrect auto-increment-increment value: '0'
118126
SET @bug20830_old_auto_increment_offset=
119127
@@auto_increment_offset= 2;
120128
SET @bug20830_old_auto_increment_increment=
@@ -237,12 +245,20 @@ SUM(c1)
237245
DROP TABLE t1;
238246
SET @@auto_increment_offset=
239247
@bug20830_old_auto_increment_offset;
248+
Warnings:
249+
Warning 1292 Truncated incorrect auto-increment-offset value: '0'
240250
SET @@auto_increment_increment=
241251
@bug20830_old_auto_increment_increment;
252+
Warnings:
253+
Warning 1292 Truncated incorrect auto-increment-increment value: '0'
242254
SET @@session.auto_increment_offset=
243255
@bug20830_old_session_auto_increment_offset;
256+
Warnings:
257+
Warning 1292 Truncated incorrect auto-increment-offset value: '0'
244258
SET @@session.auto_increment_increment=
245259
@bug20830_old_session_auto_increment_increment;
260+
Warnings:
261+
Warning 1292 Truncated incorrect auto-increment-increment value: '0'
246262
CREATE TABLE t1(a BIT);
247263
INSERT DELAYED INTO t1 VALUES(1);
248264
FLUSH TABLE t1;

‎mysql-test/r/innodb.result‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,6 +1792,8 @@ show variables like "innodb_thread_concurrency";
17921792
Variable_name Value
17931793
innodb_thread_concurrency 8
17941794
set global innodb_thread_concurrency=1001;
1795+
Warnings:
1796+
Warning 1292 Truncated incorrect innodb_thread_concurrency value: '1001'
17951797
show variables like "innodb_thread_concurrency";
17961798
Variable_name Value
17971799
innodb_thread_concurrency 1000
@@ -1811,6 +1813,8 @@ show variables like "innodb_concurrency_tickets";
18111813
Variable_name Value
18121814
innodb_concurrency_tickets 1000
18131815
set global innodb_concurrency_tickets=0;
1816+
Warnings:
1817+
Warning 1292 Truncated incorrect innodb_concurrency_tickets value: '0'
18141818
show variables like "innodb_concurrency_tickets";
18151819
Variable_name Value
18161820
innodb_concurrency_tickets 1

‎mysql-test/r/innodb_mysql.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,8 @@ INSERT INTO t1(b,c) SELECT b,c FROM t2;
673673
UPDATE t2 SET c='2007-01-03';
674674
INSERT INTO t1(b,c) SELECT b,c FROM t2;
675675
set @@sort_buffer_size=8192;
676+
Warnings:
677+
Warning 1292 Truncated incorrect sort_buffer_size value: '8192'
676678
SELECT COUNT(*) FROM t1;
677679
COUNT(*)
678680
3072

‎mysql-test/r/key_cache.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ Variable_name Value
276276
Key_blocks_unused KEY_BLOCKS_UNUSED
277277
set global keycache2.key_buffer_size=0;
278278
set global keycache3.key_buffer_size=100;
279+
Warnings:
280+
Warning 1292 Truncated incorrect key_buffer_size value: '100'
279281
set global keycache3.key_buffer_size=0;
280282
create table t1 (mytext text, FULLTEXT (mytext));
281283
insert t1 values ('aaabbb');

‎mysql-test/r/packet.result‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
set global max_allowed_packet=100;
2+
Warnings:
3+
Warning 1292 Truncated incorrect max_allowed_packet value: '100'
24
set max_allowed_packet=100;
5+
Warnings:
6+
Warning 1292 Truncated incorrect max_allowed_packet value: '100'
37
set global net_buffer_length=100;
8+
Warnings:
9+
Warning 1292 Truncated incorrect net_buffer_length value: '100'
410
set net_buffer_length=100;
11+
Warnings:
12+
Warning 1292 Truncated incorrect net_buffer_length value: '100'
513
SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
614
len
715
1024

‎mysql-test/r/ps.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,8 @@ select @@max_prepared_stmt_count;
807807
@@max_prepared_stmt_count
808808
0
809809
set global max_prepared_stmt_count=10000000000000000;
810+
Warnings:
811+
Warning 1292 Truncated incorrect max_prepared_stmt_count value: '10000000000000000'
810812
select @@max_prepared_stmt_count;
811813
@@max_prepared_stmt_count
812814
1048576

0 commit comments

Comments
 (0)