Attachment #194832 for bug #229219

View | Details | Raw Unified | Return to bug 229219
Collapse All | Expand All

Lines 2-8 Link Here

(-)databases/mariadb103-server/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mariadb	4	PORTNAME?= mariadb
5	PORTVERSION= 10.3.7	5	PORTVERSION= 10.3.8
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \

Lines 1-3 Link Here

(-)databases/mariadb103-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1527449277	1	TIMESTAMP = 1530525825
2	SHA256 (mariadb-10.3.7.tar.gz) = e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf	2	SHA256 (mariadb-10.3.8.tar.gz) = 44b409bc22775261b96f373bc01591065a680f46d295617b304cdf9ffb503ccf
3	SIZE (mariadb-10.3.7.tar.gz) = 71816160	3	SIZE (mariadb-10.3.8.tar.gz) = 72147179




--- sql-common/client.c.orig	2017-05-14 23:13:18 UTC
+++ sql-common/client.c
@@ -104,6 +104,10 @@ my_bool	net_flush(NET *net);
 #define CONNECT_TIMEOUT 0
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL)
+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
+#endif
+
 #include "client_settings.h"
 #include <ssl_compat.h>
 #include <sql_common.h>




--- sql/mysqld.cc.orig	2017-05-14 23:13:18 UTC
+++ sql/mysqld.cc
@@ -120,6 +121,7 @@
 #define HAVE_CLOSE_SERVER_SOCK 1
 #endif
 
+
 extern "C" {					// Because of SCO 3.2V4.2
 #include <sys/stat.h>
 #ifndef __GNU_LIBRARY__
@@ -4838,8 +4840,9 @@ static void init_ssl()
       while ((err= ERR_get_error()))
         sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));




--- sql/slave.cc.orig	2017-05-14 23:13:18 UTC
+++ sql/slave.cc
@@ -14,6 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#define ERR_remove_state(X)
+#elif defined(HAVE_ERR_remove_thread_state)
+#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
+#endif
 
 /**
   @addtogroup Replication




--- sql/sql_trigger.cc.orig	2018-02-26 04:27:17.000000000 +0100
+++ sql/sql_trigger.cc	2018-02-27 20:54:20.250859000 +0100
@@ -178,37 +178,37 @@ static File_option triggers_file_paramet
 {
   {
     { STRING_WITH_LEN("triggers") },
-    my_offsetof(class Table_triggers_list, definitions_list),
+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
     FILE_OPTIONS_STRLIST
   },
   {
     { STRING_WITH_LEN("sql_modes") },
-    my_offsetof(class Table_triggers_list, definition_modes_list),
+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
     FILE_OPTIONS_ULLLIST
   },
   {
     { STRING_WITH_LEN("definers") },
-    my_offsetof(class Table_triggers_list, definers_list),
+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
     FILE_OPTIONS_STRLIST
   },
   {
     { STRING_WITH_LEN("client_cs_names") },
-    my_offsetof(class Table_triggers_list, client_cs_names),
+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
     FILE_OPTIONS_STRLIST
   },
   {
     { STRING_WITH_LEN("connection_cl_names") },
-    my_offsetof(class Table_triggers_list, connection_cl_names),
+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
     FILE_OPTIONS_STRLIST
   },
   {
     { STRING_WITH_LEN("db_cl_names") },
-    my_offsetof(class Table_triggers_list, db_cl_names),
+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
     FILE_OPTIONS_STRLIST
   },
   {
     { STRING_WITH_LEN("created") },
-    my_offsetof(class Table_triggers_list, create_times),
+    static_cast<int>(my_offsetof(class Table_triggers_list, create_times)),
     FILE_OPTIONS_ULLLIST
   },
   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
@@ -217,7 +217,7 @@ static File_option triggers_file_paramet
 File_option sql_modes_parameters=
 {
   { STRING_WITH_LEN("sql_modes") },
-  my_offsetof(class Table_triggers_list, definition_modes_list),
+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
   FILE_OPTIONS_ULLLIST
 };
 




--- sql/sql_view.cc.orig	2018-02-26 04:27:17.000000000 +0100
+++ sql/sql_view.cc	2018-02-27 20:56:59.769528000 +0100
@@ -753,49 +753,49 @@ static const int required_view_parameter
 */
 static File_option view_parameters[]=
 {{{ STRING_WITH_LEN("query")},
-  my_offsetof(TABLE_LIST, select_stmt),
+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
   FILE_OPTIONS_ESTRING},
  {{ STRING_WITH_LEN("md5")},
-  my_offsetof(TABLE_LIST, md5),
+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
   FILE_OPTIONS_STRING},
  {{ STRING_WITH_LEN("updatable")},
-  my_offsetof(TABLE_LIST, updatable_view),
+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
   FILE_OPTIONS_ULONGLONG},
  {{ STRING_WITH_LEN("algorithm")},
-  my_offsetof(TABLE_LIST, algorithm),
+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
   FILE_OPTIONS_VIEW_ALGO},
  {{ STRING_WITH_LEN("definer_user")},
-  my_offsetof(TABLE_LIST, definer.user),
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
   FILE_OPTIONS_STRING},
  {{ STRING_WITH_LEN("definer_host")},
-  my_offsetof(TABLE_LIST, definer.host),
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
   FILE_OPTIONS_STRING},
  {{ STRING_WITH_LEN("suid")},
-  my_offsetof(TABLE_LIST, view_suid),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
   FILE_OPTIONS_ULONGLONG},
  {{ STRING_WITH_LEN("with_check_option")},
-  my_offsetof(TABLE_LIST, with_check),
+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
   FILE_OPTIONS_ULONGLONG},
  {{ STRING_WITH_LEN("timestamp")},
-  my_offsetof(TABLE_LIST, timestamp),
+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
   FILE_OPTIONS_TIMESTAMP},
  {{ STRING_WITH_LEN("create-version")},
-  my_offsetof(TABLE_LIST, file_version),
+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
   FILE_OPTIONS_ULONGLONG},
  {{ STRING_WITH_LEN("source")},
-  my_offsetof(TABLE_LIST, source),
+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
   FILE_OPTIONS_ESTRING},
  {{(char*) STRING_WITH_LEN("client_cs_name")},
-  my_offsetof(TABLE_LIST, view_client_cs_name),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
   FILE_OPTIONS_STRING},
  {{(char*) STRING_WITH_LEN("connection_cl_name")},
-  my_offsetof(TABLE_LIST, view_connection_cl_name),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
   FILE_OPTIONS_STRING},
  {{(char*) STRING_WITH_LEN("view_body_utf8")},
-  my_offsetof(TABLE_LIST, view_body_utf8),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
   FILE_OPTIONS_ESTRING},
  {{ STRING_WITH_LEN("mariadb-version")},
-  my_offsetof(TABLE_LIST, mariadb_version),
+  static_cast<int>(my_offsetof(TABLE_LIST, mariadb_version)),
   FILE_OPTIONS_ULONGLONG},
  {{NullS, 0},			0,
   FILE_OPTIONS_STRING}




Fix clang build error

--- sql/sys_vars.cc.orig	2017-05-14 23:13:18 UTC
+++ sql/sys_vars.cc
@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
        "connection before closing it",
        NO_SET_STMT SESSION_VAR(net_interactive_timeout),
        CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
 
 static Sys_var_ulonglong Sys_join_buffer_size(
        "join_buffer_size",
@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou
        "Number of seconds to wait for more data from a connection before "
        "aborting the read",
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_read_timeout));
 
@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo
        "Number of seconds to wait for a block to be written to a connection "
        "before aborting the write",
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_write_timeout));
 
@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou
        "The number of seconds the server waits for activity on a "
        "connection before closing it",
        NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
+       VALID_RANGE(1, INT_MAX32/1000),
        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
 
 static Sys_var_plugin Sys_default_storage_engine(

Lines 41-46 Link Here

(-)databases/mariadb103-server/pkg-plist (+2 lines)
41	bin/resolve_stack_dump	41	bin/resolve_stack_dump
42	bin/resolveip	42	bin/resolveip
43	%%ROCKSDB%%bin/sst_dump	43	%%ROCKSDB%%bin/sst_dump
		44	@comment bin/test-connect-t
44	%%TOKUDB%%bin/tokuft_logprint	45	%%TOKUDB%%bin/tokuft_logprint
45	%%TOKUDB%%bin/tokuftdump	46	%%TOKUDB%%bin/tokuftdump
46	bin/wsrep_sst_common	47	bin/wsrep_sst_common
Lines 47-52 Link Here
47	bin/wsrep_sst_mariabackup	48	bin/wsrep_sst_mariabackup
48	bin/wsrep_sst_mysqldump	49	bin/wsrep_sst_mysqldump
49	bin/wsrep_sst_rsync	50	bin/wsrep_sst_rsync
		51	bin/wsrep_sst_rsync_wan
50	bin/wsrep_sst_xtrabackup	52	bin/wsrep_sst_xtrabackup
51	bin/wsrep_sst_xtrabackup-v2	53	bin/wsrep_sst_xtrabackup-v2
52	@comment include/mysql/my_config.h	54	@comment include/mysql/my_config.h

Return to bug 229219

Lines 1-13 Link Here

(-)databases/mariadb103-server/files/patch-sql-common_client.c (-13 lines)
1	--- sql-common/client.c.orig 2017-05-14 23:13:18 UTC
2	+++ sql-common/client.c
3	@@ -104,6 +104,10 @@ my_bool net_flush(NET *net);
4	#define CONNECT_TIMEOUT 0
5	#endif
6
7	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER) \|\| defined(HAVE_YASSL)
8	+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
9	+#endif
10	+
11	#include "client_settings.h"
12	#include <ssl_compat.h>
13	#include <sql_common.h>

Lines 1-13 Link Here

(-)databases/mariadb103-server/files/patch-sql_mysqld.cc (-8 lines)
1	--- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC	1	--- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -120,6 +121,7 @@
4	#define HAVE_CLOSE_SERVER_SOCK 1
5	#endif
6
7	+
8	extern "C" { // Because of SCO 3.2V4.2
9	#include <sys/stat.h>
10	#ifndef __GNU_LIBRARY__
11	@@ -4838,8 +4840,9 @@ static void init_ssl()	3	@@ -4838,8 +4840,9 @@ static void init_ssl()
12	while ((err= ERR_get_error()))	4	while ((err= ERR_get_error()))
13	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));	5	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));

Lines 1-14 Link Here

(-)databases/mariadb103-server/files/patch-sql_slave.cc (-14 lines)
1	--- sql/slave.cc.orig 2017-05-14 23:13:18 UTC
2	+++ sql/slave.cc
3	@@ -14,6 +14,11 @@
4	along with this program; if not, write to the Free Software
5	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
6
7	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8	+#define ERR_remove_state(X)
9	+#elif defined(HAVE_ERR_remove_thread_state)
10	+#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
11	+#endif
12
13	/**
14	@addtogroup Replication

Lines 1-56 Link Here

(-)databases/mariadb103-server/files/patch-sql_sql__trigger.cc (-56 lines)
1	--- sql/sql_trigger.cc.orig 2018-02-26 04:27:17.000000000 +0100
2	+++ sql/sql_trigger.cc 2018-02-27 20:54:20.250859000 +0100
3	@@ -178,37 +178,37 @@ static File_option triggers_file_paramet
4	{
5	{
6	{ STRING_WITH_LEN("triggers") },
7	- my_offsetof(class Table_triggers_list, definitions_list),
8	+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
9	FILE_OPTIONS_STRLIST
10	},
11	{
12	{ STRING_WITH_LEN("sql_modes") },
13	- my_offsetof(class Table_triggers_list, definition_modes_list),
14	+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
15	FILE_OPTIONS_ULLLIST
16	},
17	{
18	{ STRING_WITH_LEN("definers") },
19	- my_offsetof(class Table_triggers_list, definers_list),
20	+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
21	FILE_OPTIONS_STRLIST
22	},
23	{
24	{ STRING_WITH_LEN("client_cs_names") },
25	- my_offsetof(class Table_triggers_list, client_cs_names),
26	+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
27	FILE_OPTIONS_STRLIST
28	},
29	{
30	{ STRING_WITH_LEN("connection_cl_names") },
31	- my_offsetof(class Table_triggers_list, connection_cl_names),
32	+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
33	FILE_OPTIONS_STRLIST
34	},
35	{
36	{ STRING_WITH_LEN("db_cl_names") },
37	- my_offsetof(class Table_triggers_list, db_cl_names),
38	+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
39	FILE_OPTIONS_STRLIST
40	},
41	{
42	{ STRING_WITH_LEN("created") },
43	- my_offsetof(class Table_triggers_list, create_times),
44	+ static_cast<int>(my_offsetof(class Table_triggers_list, create_times)),
45	FILE_OPTIONS_ULLLIST
46	},
47	{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
48	@@ -217,7 +217,7 @@ static File_option triggers_file_paramet
49	File_option sql_modes_parameters=
50	{
51	{ STRING_WITH_LEN("sql_modes") },
52	- my_offsetof(class Table_triggers_list, definition_modes_list),
53	+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
54	FILE_OPTIONS_ULLLIST
55	};
56

Lines 1-67 Link Here

(-)databases/mariadb103-server/files/patch-sql_sql__view.cc (-67 lines)
1	--- sql/sql_view.cc.orig 2018-02-26 04:27:17.000000000 +0100
2	+++ sql/sql_view.cc 2018-02-27 20:56:59.769528000 +0100
3	@@ -753,49 +753,49 @@ static const int required_view_parameter
4	*/
5	static File_option view_parameters[]=
6	{{{ STRING_WITH_LEN("query")},
7	- my_offsetof(TABLE_LIST, select_stmt),
8	+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
9	FILE_OPTIONS_ESTRING},
10	{{ STRING_WITH_LEN("md5")},
11	- my_offsetof(TABLE_LIST, md5),
12	+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
13	FILE_OPTIONS_STRING},
14	{{ STRING_WITH_LEN("updatable")},
15	- my_offsetof(TABLE_LIST, updatable_view),
16	+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
17	FILE_OPTIONS_ULONGLONG},
18	{{ STRING_WITH_LEN("algorithm")},
19	- my_offsetof(TABLE_LIST, algorithm),
20	+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
21	FILE_OPTIONS_VIEW_ALGO},
22	{{ STRING_WITH_LEN("definer_user")},
23	- my_offsetof(TABLE_LIST, definer.user),
24	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
25	FILE_OPTIONS_STRING},
26	{{ STRING_WITH_LEN("definer_host")},
27	- my_offsetof(TABLE_LIST, definer.host),
28	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
29	FILE_OPTIONS_STRING},
30	{{ STRING_WITH_LEN("suid")},
31	- my_offsetof(TABLE_LIST, view_suid),
32	+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
33	FILE_OPTIONS_ULONGLONG},
34	{{ STRING_WITH_LEN("with_check_option")},
35	- my_offsetof(TABLE_LIST, with_check),
36	+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
37	FILE_OPTIONS_ULONGLONG},
38	{{ STRING_WITH_LEN("timestamp")},
39	- my_offsetof(TABLE_LIST, timestamp),
40	+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
41	FILE_OPTIONS_TIMESTAMP},
42	{{ STRING_WITH_LEN("create-version")},
43	- my_offsetof(TABLE_LIST, file_version),
44	+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
45	FILE_OPTIONS_ULONGLONG},
46	{{ STRING_WITH_LEN("source")},
47	- my_offsetof(TABLE_LIST, source),
48	+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
49	FILE_OPTIONS_ESTRING},
50	{{(char*) STRING_WITH_LEN("client_cs_name")},
51	- my_offsetof(TABLE_LIST, view_client_cs_name),
52	+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
53	FILE_OPTIONS_STRING},
54	{{(char*) STRING_WITH_LEN("connection_cl_name")},
55	- my_offsetof(TABLE_LIST, view_connection_cl_name),
56	+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
57	FILE_OPTIONS_STRING},
58	{{(char*) STRING_WITH_LEN("view_body_utf8")},
59	- my_offsetof(TABLE_LIST, view_body_utf8),
60	+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
61	FILE_OPTIONS_ESTRING},
62	{{ STRING_WITH_LEN("mariadb-version")},
63	- my_offsetof(TABLE_LIST, mariadb_version),
64	+ static_cast<int>(my_offsetof(TABLE_LIST, mariadb_version)),
65	FILE_OPTIONS_ULONGLONG},
66	{{NullS, 0}, 0,
67	FILE_OPTIONS_STRING}

Lines 1-40 Link Here

(-)databases/mariadb103-server/files/patch-sql_sys__vars.cc (-40 lines)
1	Fix clang build error
2
3	--- sql/sys_vars.cc.orig 2017-05-14 23:13:18 UTC
4	+++ sql/sys_vars.cc
5	@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
6	"connection before closing it",
7	NO_SET_STMT SESSION_VAR(net_interactive_timeout),
8	CMD_LINE(REQUIRED_ARG),
9	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
10	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
11
12	static Sys_var_ulonglong Sys_join_buffer_size(
13	"join_buffer_size",
14	@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou
15	"Number of seconds to wait for more data from a connection before "
16	"aborting the read",
17	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
18	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
19	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
20	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
21	ON_UPDATE(fix_net_read_timeout));
22
23	@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo
24	"Number of seconds to wait for a block to be written to a connection "
25	"before aborting the write",
26	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
27	- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
28	+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
29	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
30	ON_UPDATE(fix_net_write_timeout));
31
32	@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou
33	"The number of seconds the server waits for activity on a "
34	"connection before closing it",
35	NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
36	- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
37	+ VALID_RANGE(1, INT_MAX32/1000),
38	DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
39
40	static Sys_var_plugin Sys_default_storage_engine(