diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index a7c0b2d..8644f6c 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -31,6 +31,7 @@ sub skip_combinations {
     '18446744073709547520' => '32bit'
   );
   die "unknown value max-binlog-stmt-cache-size=$longsysvar" unless $val_map{$longsysvar};
+  $ENV{MTR_word_size} = ( $longsysvar == 18446744073709547520 ? '64' : ( $longsysvar == 4294963200 ? '32' : '' ) );
   $skip{'include/word_size.combinations'} = [ $val_map{$longsysvar} ];
 
   # as a special case, disable certain include files as a whole
diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
index cb06b40..98bffd4 100644
--- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc
+++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -1,6 +1,7 @@
---source include/word_size.inc
+--source include/platform.inc
 --vertical_results
 
+
 # need stable timestamp, because its current value is printed below
 set time_zone='+00:00';
 set timestamp=unix_timestamp('2014-09-01 13:40:23');
@@ -11,8 +12,9 @@ set sql_mode=ansi_quotes;
 # global_value_origin=SQL
 set global div_precision_increment=5;
 
---replace_regex /^\/\S+/PATH/
+--replace_regex /^\/\S+/PATH/ /^[a-zA-Z]:[\\\/]\S+/PATH/ /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
 --replace_result $MASTER_MYPORT MASTER_MYPORT
+
 select * from information_schema.system_variables
   where variable_name not like 'aria%' and
         variable_name not like 'debug%' and
@@ -24,9 +26,11 @@ select * from information_schema.system_variables
           'large_files_support', 'log_tc_size',
           'lower_case_file_system',
           'lower_case_table_names',
+          'myisam_max_sort_file_size',
           'open_files_limit',
           'rand_seed1',
           'rand_seed2',
+          'rowid_merge_buff_size',
           'system_time_zone',
           'version_comment',
           'version_compile_machine', 'version_compile_os',
@@ -34,12 +38,17 @@ select * from information_schema.system_variables
         )
   order by variable_name;
 
+--echo
+
 # now various metadata but no values, for variables where
 # values change often
+
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+
 select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
        NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE,
        ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
-  from information_schema.system_variables
+from information_schema.system_variables
   where variable_name in (
           'have_openssl',
           'have_symlink',
@@ -57,12 +66,20 @@ select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
         )
   order by variable_name;
 
+--echo
+
 # yet less data: no values, no blocks size, no min/max value.
+# row_merge_buff_size is here because of MDEV-8539. See also note about myisam_max_sort_file_size in the report.
+
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+
 select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
        VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
-  from information_schema.system_variables
+from information_schema.system_variables
   where variable_name in (
-          'log_tc_size'
+          'log_tc_size',
+          'myisam_max_sort_file_size',
+          'rowid_merge_buff_size'
         )
   order by variable_name;
 
diff --git a/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff
deleted file mode 100644
index 979f9d8..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff
+++ /dev/null
@@ -1,105 +0,0 @@
---- sysvars_aria.result	2015-01-09 11:49:32.000000000 +0100
-+++ sysvars_aria,32bit.result	2015-01-09 17:30:11.000000000 +0100
-@@ -7,7 +7,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8192
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Block size to be used for Aria index pages.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	32768
-@@ -21,7 +21,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -35,7 +35,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -63,7 +63,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -91,7 +91,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Interval between commite in microseconds (1/1000000c). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode.  Option has only an effect if aria_group_commit is used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -105,7 +105,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit for transaction log size
- NUMERIC_MIN_VALUE	8388608
- NUMERIC_MAX_VALUE	4294967295
-@@ -147,10 +147,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	100
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -175,7 +175,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum percentage of warm blocks in key cache
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100
-@@ -189,7 +189,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	512
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
- NUMERIC_MIN_VALUE	128
- NUMERIC_MAX_VALUE	16384
-@@ -231,7 +231,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -248,7 +248,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/sysvars_aria.result b/mysql-test/suite/sys_vars/r/sysvars_aria.result
index fdaa20f..95802f3 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_aria.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_aria.result
@@ -7,7 +7,7 @@ GLOBAL_VALUE	8192
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8192
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Block size to be used for Aria index pages.
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	32768
@@ -21,10 +21,10 @@ GLOBAL_VALUE	30
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -35,10 +35,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -63,7 +63,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
@@ -91,10 +91,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Interval between commite in microseconds (1/1000000c). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode.  Option has only an effect if aria_group_commit is used
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -105,10 +105,10 @@ GLOBAL_VALUE	104857600
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit for transaction log size
 NUMERIC_MIN_VALUE	8388608
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	8192
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -129,14 +129,14 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_MAX_SORT_FILE_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	9223372036853727232
+GLOBAL_VALUE	<32-bit or 64-bit MAX SIGNED ADJUSTED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	9223372036853727232
+DEFAULT_VALUE	<32-bit or 64-bit MAX SIGNED ADJUSTED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1048576
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -147,10 +147,10 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
 NUMERIC_MIN_VALUE	100
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	100
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -161,10 +161,10 @@ GLOBAL_VALUE	8388608
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer used for index blocks for Aria tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford.
 NUMERIC_MIN_VALUE	131072
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -175,7 +175,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum percentage of warm blocks in key cache
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100
@@ -189,7 +189,7 @@ GLOBAL_VALUE	512
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	512
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
 NUMERIC_MIN_VALUE	128
 NUMERIC_MAX_VALUE	16384
@@ -231,7 +231,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
@@ -245,10 +245,10 @@ GLOBAL_VALUE	268434432
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	268434432
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff
deleted file mode 100644
index 799ad90..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff
+++ /dev/null
@@ -1,24 +0,0 @@
---- suite/sys_vars/r/sysvars_debug.result	2014-10-10 13:33:55.000000000 +0300
-+++ suite/sys_vars/r/sysvars_debug,32bit.reject	2014-10-10 19:36:44.000000000 +0300
-@@ -21,7 +21,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Extra sleep (in microseconds) to add to binlog fsync(), for debugging
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -35,10 +35,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Call my_debug_put_break_here() if crc matches this number (for debug)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug,win.rdiff b/mysql-test/suite/sys_vars/r/sysvars_debug,win.rdiff
new file mode 100644
index 0000000..93b7bb0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/sysvars_debug,win.rdiff
@@ -0,0 +1,24 @@
+--- suite/sys_vars/r/sysvars_debug.result	2015-08-05 17:03:53.558529600 +0300
++++ suite/sys_vars/r/sysvars_debug.reject	2015-08-05 17:53:27.921725800 +0300
+@@ -57,20 +57,6 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
+-VARIABLE_NAME	DEBUG_MUTEX_DEADLOCK_DETECTOR
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	ON
+-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	ON
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BOOLEAN
+-VARIABLE_COMMENT	Enable checking of wrong mutex usage
+-NUMERIC_MIN_VALUE	NULL
+-NUMERIC_MAX_VALUE	NULL
+-NUMERIC_BLOCK_SIZE	NULL
+-ENUM_VALUE_LIST	OFF,ON
+-READ_ONLY	YES
+-COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	DEBUG_NO_THREAD_ALARM
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+
diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug.result b/mysql-test/suite/sys_vars/r/sysvars_debug.result
index a46e135..a4587ab 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_debug.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_debug.result
@@ -21,10 +21,10 @@ GLOBAL_VALUE	314
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Extra sleep (in microseconds) to add to binlog fsync(), for debugging
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -35,10 +35,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Call my_debug_put_break_here() if crc matches this number (for debug)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
deleted file mode 100644
index 6842118..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+++ /dev/null
@@ -1,1243 +0,0 @@
---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,32bit,xtradb.reject
-@@ -47,13 +47,27 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	1
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
-+NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	32
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_ADAPTIVE_MAX_SLEEP_DELAY
- SESSION_VALUE	NULL
- GLOBAL_VALUE	150000
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The upper limit of the sleep delay in usec. Value of 0 disables it.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000000
-@@ -67,10 +81,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8388608
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	DEPRECATED. This option may be removed in future releases, together with the option innodb_use_sys_malloc and with the InnoDB's internal memory allocator. Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.
- NUMERIC_MIN_VALUE	524288
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -81,7 +95,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Background commit interval in seconds
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1073741824
-@@ -137,7 +151,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB API transaction isolation level
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	3
-@@ -151,7 +165,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	64
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Data file autoextend increment in megabytes
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1000
-@@ -165,7 +179,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	The AUTOINC lock modes supported by InnoDB:               0 => Old style AUTOINC locking (for backward compatibility)                                           1 => New style AUTOINC locking                            2 => No AUTOINC locking (unsafe for SBR)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -291,7 +305,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of buffer pool instances, set to higher value on high-end machines to increase scalability
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	64
-@@ -341,6 +355,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_BUFFER_POOL_POPULATE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Preallocate (pre-fault) the page frames required for the mapping established by the buffer pool memory region. Disabled by default.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	NONE
- VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
- SESSION_VALUE	NULL
- GLOBAL_VALUE	8388608
-@@ -361,7 +389,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -432,7 +460,7 @@
- DEFAULT_VALUE	ON
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BOOLEAN
--VARIABLE_COMMENT	DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums.
-+VARIABLE_COMMENT	DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
-@@ -453,6 +481,104 @@
- ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CLEANER_EVICTION_FACTOR
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_CLEANER_FLUSH_CHUNK_SIZE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	100
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	100
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Divide page cleaner flush list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CLEANER_FREE_LIST_LWM
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	10
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	10
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	100
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CLEANER_LRU_CHUNK_SIZE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	100
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	100
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Divide page cleaner LRU list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CLEANER_LSN_AGE_FACTOR
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	HIGH_CHECKPOINT
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	HIGH_CHECKPOINT
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	ENUM
-+VARIABLE_COMMENT	The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	LEGACY,HIGH_CHECKPOINT
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_CLEANER_MAX_FLUSH_TIME
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1000
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	1000
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CLEANER_MAX_LRU_TIME
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1000
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	1000
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_CMP_PER_INDEX_ENABLED
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
-@@ -473,7 +599,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -501,7 +627,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -529,7 +655,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Percentage of empty space on a data page that can be reserved to make the page compressible.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	75
-@@ -543,14 +669,28 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_CORRUPT_TABLE_ACTION
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	assert
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	assert
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	ENUM
-+VARIABLE_COMMENT	Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	assert,warn,salvage
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_DATA_FILE_PATH
- SESSION_VALUE	NULL
- GLOBAL_VALUE	ibdata1:12M:autoextend
-@@ -739,7 +879,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	120
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of pages reserved in doublewrite buffer for batch flushing
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	127
-@@ -747,6 +887,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_EMPTY_FREE_LIST_ALGORITHM
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	BACKOFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	BACKOFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	ENUM
-+VARIABLE_COMMENT	The algorithm to use for empty free list handling.  Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	LEGACY,BACKOFF
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_ENCRYPTION_ROTATE_KEY_AGE
- SESSION_VALUE	NULL
- GLOBAL_VALUE	1
-@@ -817,13 +971,27 @@
- ENUM_VALUE_LIST	OFF,ON,FORCE
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_FAKE_CHANGES
-+SESSION_VALUE	OFF
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	SESSION
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_FAST_SHUTDOWN
- SESSION_VALUE	NULL
- GLOBAL_VALUE	1
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -837,7 +1005,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	600
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of seconds that semaphore times out in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -907,7 +1075,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Make the first page of the given tablespace dirty.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -921,7 +1089,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of iterations over which the background flushing is averaged.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1000
-@@ -944,12 +1112,12 @@
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
--SESSION_VALUE	NULL
-+SESSION_VALUE	1
- GLOBAL_VALUE	1
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
--VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_SCOPE	SESSION
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	3
-@@ -977,7 +1145,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -1019,7 +1187,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps to save your data in case the disk image of the database becomes corrupt.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	6
-@@ -1033,7 +1201,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Kills the server during crash recovery.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10
-@@ -1041,6 +1209,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_FOREGROUND_PREFLUSH
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	EXPONENTIAL_BACKOFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	EXPONENTIAL_BACKOFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	ENUM
-+VARIABLE_COMMENT	The algorithm InnoDB uses for the query threads at sync preflush.  Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	SYNC_PREFLUSH,EXPONENTIAL_BACKOFF
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_FT_AUX_TABLE
- SESSION_VALUE	NULL
- GLOBAL_VALUE	
-@@ -1061,7 +1243,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search cache size in bytes
- NUMERIC_MIN_VALUE	1600000
- NUMERIC_MAX_VALUE	80000000
-@@ -1103,7 +1285,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	84
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search maximum token size in characters
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	84
-@@ -1117,7 +1299,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	3
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search minimum token size in characters
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16
-@@ -1131,7 +1313,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search number of words to optimize for each optimize table call 
- NUMERIC_MIN_VALUE	1000
- NUMERIC_MAX_VALUE	10000
-@@ -1145,7 +1327,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2000000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search query result cache limit in bytes
- NUMERIC_MIN_VALUE	1000000
- NUMERIC_MAX_VALUE	4294967295
-@@ -1173,7 +1355,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	16
-@@ -1187,7 +1369,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	640000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Total memory allocated for InnoDB Fulltext Search cache
- NUMERIC_MIN_VALUE	32000000
- NUMERIC_MAX_VALUE	1600000000
-@@ -1215,7 +1397,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -1257,10 +1439,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	200
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of IOPs the server can do. Tunes the background IO rate
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1269,12 +1451,26 @@
- SESSION_VALUE	NULL
- GLOBAL_VALUE	2000
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709551615
-+DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit to which innodb_io_capacity can be inflated.
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_KILL_IDLE_TRANSACTION
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	0
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	0
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT
-+VARIABLE_COMMENT	No effect for this build.
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1307,6 +1503,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_LOCKING_FAKE_CHANGES
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	ON
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	ON
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes.  If disabled, fake change transactions will not take any locks at all.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	NONE
- VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
-@@ -1327,7 +1537,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1073741824
-@@ -1335,37 +1545,107 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
--VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
--SESSION_VALUE	NULL
--GLOBAL_VALUE	1048576
--GLOBAL_VALUE_ORIGIN	CONFIG
--DEFAULT_VALUE	8388608
--VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
--VARIABLE_COMMENT	The size of the buffer which InnoDB uses to write log to the log files on disk.
--NUMERIC_MIN_VALUE	262144
--NUMERIC_MAX_VALUE	9223372036854775807
--NUMERIC_BLOCK_SIZE	1024
--ENUM_VALUE_LIST	NULL
--READ_ONLY	YES
--COMMAND_LINE_ARGUMENT	REQUIRED
--VARIABLE_NAME	INNODB_LOG_CHECKPOINT_NOW
-+VARIABLE_NAME	INNODB_LOG_ARCHIVE
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	OFF
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BOOLEAN
--VARIABLE_COMMENT	Force checkpoint now
-+VARIABLE_COMMENT	Set to 1 if you want to have logs archived.
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
--VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
-+VARIABLE_NAME	INNODB_LOG_ARCH_DIR
- SESSION_VALUE	NULL
--GLOBAL_VALUE	OFF
-+GLOBAL_VALUE	PATH
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	VARCHAR
-+VARIABLE_COMMENT	Where full logs should be archived.
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_LOG_ARCH_EXPIRE_SEC
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	0
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	0
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Expiration time for archived innodb transaction logs.
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_LOG_BLOCK_SIZE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	512
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	512
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk!
-+NUMERIC_MIN_VALUE	512
-+NUMERIC_MAX_VALUE	65536
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1048576
-+GLOBAL_VALUE_ORIGIN	CONFIG
-+DEFAULT_VALUE	8388608
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT
-+VARIABLE_COMMENT	The size of the buffer which InnoDB uses to write log to the log files on disk.
-+NUMERIC_MIN_VALUE	262144
-+NUMERIC_MAX_VALUE	2147483647
-+NUMERIC_BLOCK_SIZE	1024
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_LOG_CHECKPOINT_NOW
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Force checkpoint now
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_LOG_CHECKSUM_ALGORITHM
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	INNODB
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	INNODB
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	ENUM
-+VARIABLE_COMMENT	The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	OFF
- VARIABLE_SCOPE	GLOBAL
-@@ -1383,7 +1663,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of log files in the log group. InnoDB writes to the files in a circular fashion.
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	100
-@@ -1425,9 +1705,37 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How deep to scan LRU to keep it clean
- NUMERIC_MIN_VALUE	100
-+NUMERIC_MAX_VALUE	4294967295
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_MAX_BITMAP_FILE_SIZE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	104857600
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	104857600
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_COMMENT	The maximum size of changed page bitmap files
-+NUMERIC_MIN_VALUE	4096
-+NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_MAX_CHANGED_PAGES
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1000000
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	1000000
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_COMMENT	The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited
-+NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	18446744073709551615
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
-@@ -1467,10 +1775,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Desired maximum length of the purge queue (0 = no limit)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1481,7 +1789,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum delay of user threads in micro-seconds
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10000000
-@@ -1495,7 +1803,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of identical copies of log groups we keep for the database. Currently this should be set to 1.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10
-@@ -1565,7 +1873,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of multi-threaded flush threads
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
-@@ -1621,10 +1929,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	How many files at the maximum InnoDB keeps open at the same time.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -1649,7 +1957,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -1663,7 +1971,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Page size to use for all InnoDB tablespaces.
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	65536
-@@ -1699,13 +2007,69 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_PRIORITY_CLEANER
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Make buffer pool cleaner and LRU manager threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_PRIORITY_IO
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Make I/O threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_PRIORITY_MASTER
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Make buffer pool cleaner thread acquire shared resources with priority
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_PRIORITY_PURGE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Make purge coordinator and worker threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_PURGE_BATCH_SIZE
- SESSION_VALUE	NULL
- GLOBAL_VALUE	300
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of UNDO log pages to purge in one batch from the history list.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	5000
-@@ -1747,7 +2111,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Purge threads can be from 1 to 32. Default is 1.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	32
-@@ -1775,7 +2139,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	56
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	64
-@@ -1789,7 +2153,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of background read I/O threads in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
-@@ -1817,10 +2181,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Replication thread delay (ms) on the slave server if innodb_thread_concurrency is reached (0 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1845,7 +2209,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo logs to use (deprecated).
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -1859,7 +2223,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	An InnoDB page number.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -1867,6 +2231,48 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_SCHED_PRIORITY_IO
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	19
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	19
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Nice value for the I/O handler thread scheduling
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	39
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_SCHED_PRIORITY_MASTER
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	19
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	19
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Nice value for the master thread scheduling
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	39
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_SCHED_PRIORITY_PURGE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	19
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	19
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Nice value for the purge thread scheduling
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	39
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_SCRUB_LOG
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
-@@ -1895,6 +2301,34 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_SHOW_LOCKS_HELD
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	10
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	10
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	1000
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_SHOW_VERBOSE_LOCKS
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	0
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	0
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	INT UNSIGNED
-+VARIABLE_COMMENT	Whether to show records locked in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	1
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
- SESSION_VALUE	NULL
- GLOBAL_VALUE	0
-@@ -1915,7 +2349,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Memory buffer size for index creation
- NUMERIC_MIN_VALUE	65536
- NUMERIC_MAX_VALUE	67108864
-@@ -1929,10 +2363,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	6
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum delay between polling for a spin lock (6 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1958,7 +2392,7 @@
- DEFAULT_VALUE	nulls_equal
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	ENUM
--VARIABLE_COMMENT	Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED
-+VARIABLE_COMMENT	Specifies how InnoDB index statistics collection code should treat NULLs
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
-@@ -2125,7 +2559,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of the mutex/lock wait array.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -2139,10 +2573,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Count of spin-loop rounds in InnoDB mutexes (30 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2167,7 +2601,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -2181,7 +2615,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000000
-@@ -2189,6 +2623,34 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	REQUIRED
-+VARIABLE_NAME	INNODB_TRACK_CHANGED_PAGES
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Track the redo log for changed pages and output a changed page bitmap
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	NONE
-+VARIABLE_NAME	INNODB_TRACK_REDO_LOG_NOW
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Force log tracker to catch up with checkpoint now
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
-@@ -2237,7 +2699,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo logs to use.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -2251,7 +2713,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo tablespaces to use. 
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	126
-@@ -2266,7 +2728,7 @@
- DEFAULT_VALUE	OFF
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BOOLEAN
--VARIABLE_COMMENT	Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
-+VARIABLE_COMMENT	Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
-@@ -2287,6 +2749,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
- COMMAND_LINE_ARGUMENT	NONE
-+VARIABLE_NAME	INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	ON
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	ON
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Use global innodb_flush_log_at_trx_commit value. (default: ON).
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	NONE
- VARIABLE_NAME	INNODB_USE_MTFLUSH
- SESSION_VALUE	NULL
- GLOBAL_VALUE	OFF
-@@ -2301,6 +2777,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
- COMMAND_LINE_ARGUMENT	NONE
-+VARIABLE_NAME	INNODB_USE_STACKTRACE
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	OFF
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	OFF
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BOOLEAN
-+VARIABLE_COMMENT	Print stacktrace on long semaphore wait (off by default supported only on linux)
-+NUMERIC_MIN_VALUE	NULL
-+NUMERIC_MAX_VALUE	NULL
-+NUMERIC_BLOCK_SIZE	NULL
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	NONE
- VARIABLE_NAME	INNODB_USE_SYS_MALLOC
- SESSION_VALUE	NULL
- GLOBAL_VALUE	ON
-@@ -2331,12 +2821,12 @@
- COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_VERSION
- SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.25
-+GLOBAL_VALUE	5.6.24-72.2
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	NULL
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	VARCHAR
--VARIABLE_COMMENT	InnoDB version
-+VARIABLE_COMMENT	Percona-InnoDB-plugin version
- NUMERIC_MIN_VALUE	NULL
- NUMERIC_MAX_VALUE	NULL
- NUMERIC_BLOCK_SIZE	NULL
-@@ -2349,7 +2839,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of background write I/O threads in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
deleted file mode 100644
index 85f8e9c..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
+++ /dev/null
@@ -1,571 +0,0 @@
---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,32bit.reject
-@@ -53,7 +53,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The upper limit of the sleep delay in usec. Value of 0 disables it.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000000
-@@ -67,10 +67,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8388608
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	DEPRECATED. This option may be removed in future releases, together with the option innodb_use_sys_malloc and with the InnoDB's internal memory allocator. Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.
- NUMERIC_MIN_VALUE	524288
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -81,7 +81,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Background commit interval in seconds
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1073741824
-@@ -137,7 +137,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB API transaction isolation level
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	3
-@@ -151,7 +151,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	64
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Data file autoextend increment in megabytes
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1000
-@@ -165,7 +165,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	The AUTOINC lock modes supported by InnoDB:               0 => Old style AUTOINC locking (for backward compatibility)                                           1 => New style AUTOINC locking                            2 => No AUTOINC locking (unsafe for SBR)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -291,7 +291,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of buffer pool instances, set to higher value on high-end machines to increase scalability
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	64
-@@ -361,7 +361,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -473,7 +473,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -501,7 +501,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -529,7 +529,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Percentage of empty space on a data page that can be reserved to make the page compressible.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	75
-@@ -543,10 +543,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -739,7 +739,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	120
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of pages reserved in doublewrite buffer for batch flushing
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	127
-@@ -823,7 +823,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -837,7 +837,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	600
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of seconds that semaphore times out in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -907,7 +907,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Make the first page of the given tablespace dirty.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -921,7 +921,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of iterations over which the background flushing is averaged.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1000
-@@ -949,7 +949,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	3
-@@ -977,7 +977,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2
-@@ -1019,7 +1019,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps to save your data in case the disk image of the database becomes corrupt.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	6
-@@ -1033,7 +1033,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Kills the server during crash recovery.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10
-@@ -1061,7 +1061,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search cache size in bytes
- NUMERIC_MIN_VALUE	1600000
- NUMERIC_MAX_VALUE	80000000
-@@ -1103,7 +1103,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	84
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search maximum token size in characters
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	84
-@@ -1117,7 +1117,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	3
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search minimum token size in characters
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16
-@@ -1131,7 +1131,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search number of words to optimize for each optimize table call 
- NUMERIC_MIN_VALUE	1000
- NUMERIC_MAX_VALUE	10000
-@@ -1145,7 +1145,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2000000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search query result cache limit in bytes
- NUMERIC_MIN_VALUE	1000000
- NUMERIC_MAX_VALUE	4294967295
-@@ -1173,7 +1173,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	16
-@@ -1187,7 +1187,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	640000000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Total memory allocated for InnoDB Fulltext Search cache
- NUMERIC_MIN_VALUE	32000000
- NUMERIC_MAX_VALUE	1600000000
-@@ -1215,7 +1215,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -1257,10 +1257,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	200
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of IOPs the server can do. Tunes the background IO rate
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1269,12 +1269,12 @@
- SESSION_VALUE	NULL
- GLOBAL_VALUE	2000
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709551615
-+DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit to which innodb_io_capacity can be inflated.
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1327,7 +1327,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1073741824
-@@ -1341,10 +1341,10 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	8388608
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	The size of the buffer which InnoDB uses to write log to the log files on disk.
- NUMERIC_MIN_VALUE	262144
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -1383,7 +1383,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of log files in the log group. InnoDB writes to the files in a circular fashion.
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	100
-@@ -1425,10 +1425,10 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How deep to scan LRU to keep it clean
- NUMERIC_MIN_VALUE	100
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1467,10 +1467,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Desired maximum length of the purge queue (0 = no limit)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1481,7 +1481,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum delay of user threads in micro-seconds
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10000000
-@@ -1495,7 +1495,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of identical copies of log groups we keep for the database. Currently this should be set to 1.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10
-@@ -1565,7 +1565,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of multi-threaded flush threads
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
-@@ -1621,10 +1621,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	How many files at the maximum InnoDB keeps open at the same time.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -1649,7 +1649,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -1663,7 +1663,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Page size to use for all InnoDB tablespaces.
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	65536
-@@ -1705,7 +1705,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of UNDO log pages to purge in one batch from the history list.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	5000
-@@ -1747,7 +1747,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Purge threads can be from 1 to 32. Default is 1.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	32
-@@ -1775,7 +1775,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	56
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	64
-@@ -1789,7 +1789,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of background read I/O threads in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
-@@ -1817,10 +1817,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Replication thread delay (ms) on the slave server if innodb_thread_concurrency is reached (0 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1845,7 +1845,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo logs to use (deprecated).
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -1859,7 +1859,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	An InnoDB page number.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -1915,7 +1915,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Memory buffer size for index creation
- NUMERIC_MIN_VALUE	65536
- NUMERIC_MAX_VALUE	67108864
-@@ -1929,10 +1929,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	6
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum delay between polling for a spin lock (6 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2125,7 +2125,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of the mutex/lock wait array.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -2139,10 +2139,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Count of spin-loop rounds in InnoDB mutexes (30 by default)
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	0
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2167,7 +2167,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -2181,7 +2181,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000000
-@@ -2237,7 +2237,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo logs to use.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	128
-@@ -2251,7 +2251,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of undo tablespaces to use. 
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	126
-@@ -2349,7 +2349,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of background write I/O threads in InnoDB.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	64
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,win,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,win,xtradb.rdiff
new file mode 100644
index 0000000..3fdcae3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,win,xtradb.rdiff
@@ -0,0 +1,553 @@
+--- suite/sys_vars/r/sysvars_innodb.result	2015-08-05 03:40:54.000000000 +0300
++++ suite/sys_vars/r/sysvars_innodb.reject	2015-08-05 03:47:14.000000000 +0300
+@@ -341,6 +341,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_BUFFER_POOL_POPULATE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Preallocate (pre-fault) the page frames required for the mapping established by the buffer pool memory region. Disabled by default.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	NONE
+ VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	8388608
+@@ -432,7 +446,7 @@
+ DEFAULT_VALUE	ON
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	BOOLEAN
+-VARIABLE_COMMENT	DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums.
++VARIABLE_COMMENT	DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -453,6 +467,104 @@
+ ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CLEANER_EVICTION_FACTOR
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_CLEANER_FLUSH_CHUNK_SIZE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	100
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	100
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Divide page cleaner flush list flush batches into chunks of this size
++NUMERIC_MIN_VALUE	1
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CLEANER_FREE_LIST_LWM
++SESSION_VALUE	NULL
++GLOBAL_VALUE	10
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	10
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	100
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CLEANER_LRU_CHUNK_SIZE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	100
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	100
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Divide page cleaner LRU list flush batches into chunks of this size
++NUMERIC_MIN_VALUE	1
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CLEANER_LSN_AGE_FACTOR
++SESSION_VALUE	NULL
++GLOBAL_VALUE	HIGH_CHECKPOINT
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	HIGH_CHECKPOINT
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	ENUM
++VARIABLE_COMMENT	The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	LEGACY,HIGH_CHECKPOINT
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_CLEANER_MAX_FLUSH_TIME
++SESSION_VALUE	NULL
++GLOBAL_VALUE	1000
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	1000
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CLEANER_MAX_LRU_TIME
++SESSION_VALUE	NULL
++GLOBAL_VALUE	1000
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	1000
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_CMP_PER_INDEX_ENABLED
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -551,6 +663,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_CORRUPT_TABLE_ACTION
++SESSION_VALUE	NULL
++GLOBAL_VALUE	assert
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	assert
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	ENUM
++VARIABLE_COMMENT	Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	assert,warn,salvage
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_DATA_FILE_PATH
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	ibdata1:12M:autoextend
+@@ -747,6 +873,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_EMPTY_FREE_LIST_ALGORITHM
++SESSION_VALUE	NULL
++GLOBAL_VALUE	BACKOFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	BACKOFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	ENUM
++VARIABLE_COMMENT	The algorithm to use for empty free list handling.  Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	LEGACY,BACKOFF
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_ENCRYPTION_ROTATE_KEY_AGE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	1
+@@ -817,6 +957,20 @@
+ ENUM_VALUE_LIST	OFF,ON,FORCE
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_FAKE_CHANGES
++SESSION_VALUE	OFF
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	SESSION
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_FAST_SHUTDOWN
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	1
+@@ -944,11 +1098,11 @@
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
+-SESSION_VALUE	NULL
++SESSION_VALUE	1
+ GLOBAL_VALUE	1
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ DEFAULT_VALUE	1
+-VARIABLE_SCOPE	GLOBAL
++VARIABLE_SCOPE	SESSION
+ VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+ VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
+ NUMERIC_MIN_VALUE	0
+@@ -1041,6 +1195,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_FOREGROUND_PREFLUSH
++SESSION_VALUE	NULL
++GLOBAL_VALUE	EXPONENTIAL_BACKOFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	EXPONENTIAL_BACKOFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	ENUM
++VARIABLE_COMMENT	The algorithm InnoDB uses for the query threads at sync preflush.  Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	SYNC_PREFLUSH,EXPONENTIAL_BACKOFF
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_FT_AUX_TABLE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	
+@@ -1279,6 +1447,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_KILL_IDLE_TRANSACTION
++SESSION_VALUE	NULL
++GLOBAL_VALUE	0
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	0
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT>
++VARIABLE_COMMENT	No effect for this build.
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_LARGE_PREFIX
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -1307,6 +1489,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_LOCKING_FAKE_CHANGES
++SESSION_VALUE	NULL
++GLOBAL_VALUE	ON
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	ON
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes.  If disabled, fake change transactions will not take any locks at all.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	NONE
+ VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -1335,6 +1531,62 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_LOG_ARCHIVE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Set to 1 if you want to have logs archived.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_LOG_ARCH_DIR
++SESSION_VALUE	NULL
++GLOBAL_VALUE	PATH
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	VARCHAR
++VARIABLE_COMMENT	Where full logs should be archived.
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_LOG_ARCH_EXPIRE_SEC
++SESSION_VALUE	NULL
++GLOBAL_VALUE	0
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	0
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Expiration time for archived innodb transaction logs.
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_LOG_BLOCK_SIZE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	512
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	512
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk!
++NUMERIC_MIN_VALUE	512
++NUMERIC_MAX_VALUE	65536
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	1048576
+@@ -1363,6 +1615,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_LOG_CHECKSUM_ALGORITHM
++SESSION_VALUE	NULL
++GLOBAL_VALUE	INNODB
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	INNODB
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	ENUM
++VARIABLE_COMMENT	The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -1433,6 +1699,34 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_MAX_BITMAP_FILE_SIZE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	104857600
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	104857600
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	The maximum size of changed page bitmap files
++NUMERIC_MIN_VALUE	4096
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_MAX_CHANGED_PAGES
++SESSION_VALUE	NULL
++GLOBAL_VALUE	1000000
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	1000000
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_MAX_DIRTY_PAGES_PCT
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	75.000000
+@@ -1895,6 +2301,34 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_SHOW_LOCKS_HELD
++SESSION_VALUE	NULL
++GLOBAL_VALUE	10
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	10
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS.
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	1000
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_SHOW_VERBOSE_LOCKS
++SESSION_VALUE	NULL
++GLOBAL_VALUE	0
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	0
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Whether to show records locked in SHOW INNODB STATUS.
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	1
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_SIMULATE_COMP_FAILURES
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	0
+@@ -1958,7 +2392,7 @@
+ DEFAULT_VALUE	nulls_equal
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	ENUM
+-VARIABLE_COMMENT	Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED
++VARIABLE_COMMENT	Specifies how InnoDB index statistics collection code should treat NULLs
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -2189,6 +2623,34 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	INNODB_TRACK_CHANGED_PAGES
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Track the redo log for changed pages and output a changed page bitmap
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	NONE
++VARIABLE_NAME	INNODB_TRACK_REDO_LOG_NOW
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Force log tracker to catch up with checkpoint now
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -2266,7 +2728,7 @@
+ DEFAULT_VALUE	OFF
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	BOOLEAN
+-VARIABLE_COMMENT	Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
++VARIABLE_COMMENT	Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -2287,6 +2749,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES
+ COMMAND_LINE_ARGUMENT	NONE
++VARIABLE_NAME	INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
++SESSION_VALUE	NULL
++GLOBAL_VALUE	ON
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	ON
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Use global innodb_flush_log_at_trx_commit value. (default: ON).
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	NONE
+ VARIABLE_NAME	INNODB_USE_MTFLUSH
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+@@ -2301,6 +2777,20 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES
+ COMMAND_LINE_ARGUMENT	NONE
++VARIABLE_NAME	INNODB_USE_STACKTRACE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Print stacktrace on long semaphore wait (off by default supported only on linux)
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	NONE
+ VARIABLE_NAME	INNODB_USE_SYS_MALLOC
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	ON
+@@ -2336,7 +2826,7 @@
+ DEFAULT_VALUE	NULL
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	VARCHAR
+-VARIABLE_COMMENT	InnoDB version
++VARIABLE_COMMENT	Percona-InnoDB-plugin version
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -2360,3 +2850,17 @@
+ 
+ select * from information_schema.system_variables
+ where variable_name = 'innodb_adaptive_hash_index_partitions';
++VARIABLE_NAME	INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
++SESSION_VALUE	NULL
++GLOBAL_VALUE	1
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	1
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
++NUMERIC_MIN_VALUE	1
++NUMERIC_MAX_VALUE	<value equals the word size>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	REQUIRED
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
index 28c12e2..6f85900 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
@@ -1,27 +1,6 @@
---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject
-@@ -47,6 +47,20 @@
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
- COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	1
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	1
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_COMMENT	Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
-+NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	64
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	YES
-+COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	INNODB_ADAPTIVE_MAX_SLEEP_DELAY
- SESSION_VALUE	NULL
- GLOBAL_VALUE	150000
-@@ -341,6 +355,20 @@
+--- suite/sys_vars/r/sysvars_innodb.result	2015-08-05 03:40:54.000000000 +0300
++++ suite/sys_vars/r/sysvars_innodb.reject	2015-08-05 03:47:14.000000000 +0300
+@@ -341,6 +341,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -42,7 +21,7 @@
  VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	8388608
-@@ -432,7 +460,7 @@
+@@ -432,7 +446,7 @@
  DEFAULT_VALUE	ON
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -51,7 +30,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -453,6 +481,104 @@
+@@ -453,6 +467,104 @@
  ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -75,10 +54,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	100
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Divide page cleaner flush list flush batches into chunks of this size
 +NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -89,7 +68,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	10
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	100
@@ -103,10 +82,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	100
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Divide page cleaner LRU list flush batches into chunks of this size
 +NUMERIC_MIN_VALUE	1
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -131,10 +110,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	1000
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds
 +NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -145,10 +124,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	1000
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds
 +NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -156,7 +135,7 @@
  VARIABLE_NAME	INNODB_CMP_PER_INDEX_ENABLED
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -551,6 +677,20 @@
+@@ -551,6 +663,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -177,7 +156,7 @@
  VARIABLE_NAME	INNODB_DATA_FILE_PATH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ibdata1:12M:autoextend
-@@ -747,6 +887,20 @@
+@@ -747,6 +873,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -198,7 +177,7 @@
  VARIABLE_NAME	INNODB_ENCRYPTION_ROTATE_KEY_AGE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1
-@@ -817,6 +971,20 @@
+@@ -817,6 +957,20 @@
  ENUM_VALUE_LIST	OFF,ON,FORCE
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -219,7 +198,7 @@
  VARIABLE_NAME	INNODB_FAST_SHUTDOWN
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1
-@@ -944,11 +1112,11 @@
+@@ -944,11 +1098,11 @@
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
@@ -230,10 +209,10 @@
  DEFAULT_VALUE	1
 -VARIABLE_SCOPE	GLOBAL
 +VARIABLE_SCOPE	SESSION
- VARIABLE_TYPE	BIGINT UNSIGNED
+ VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
  VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
  NUMERIC_MIN_VALUE	0
-@@ -1041,6 +1209,20 @@
+@@ -1041,6 +1195,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -254,7 +233,7 @@
  VARIABLE_NAME	INNODB_FT_AUX_TABLE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	
-@@ -1279,6 +1461,20 @@
+@@ -1279,6 +1447,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -264,10 +243,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	0
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	<INT or BIGINT>
 +VARIABLE_COMMENT	No effect for this build.
 +NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	9223372036854775807
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -275,7 +254,7 @@
  VARIABLE_NAME	INNODB_LARGE_PREFIX
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1307,6 +1503,20 @@
+@@ -1307,6 +1489,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -296,7 +275,7 @@
  VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1335,6 +1545,62 @@
+@@ -1335,6 +1531,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -334,10 +313,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	0
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Expiration time for archived innodb transaction logs.
 +NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -348,7 +327,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	512
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk!
 +NUMERIC_MIN_VALUE	512
 +NUMERIC_MAX_VALUE	65536
@@ -359,7 +338,7 @@
  VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1048576
-@@ -1363,6 +1629,20 @@
+@@ -1363,6 +1615,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -380,7 +359,7 @@
  VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1433,6 +1713,34 @@
+@@ -1433,6 +1699,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -390,10 +369,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	104857600
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	The maximum size of changed page bitmap files
 +NUMERIC_MIN_VALUE	4096
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -404,10 +383,10 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	1000000
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited
 +NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 +NUMERIC_BLOCK_SIZE	0
 +ENUM_VALUE_LIST	NULL
 +READ_ONLY	NO
@@ -415,7 +394,7 @@
  VARIABLE_NAME	INNODB_MAX_DIRTY_PAGES_PCT
  SESSION_VALUE	NULL
  GLOBAL_VALUE	75.000000
-@@ -1699,6 +2007,62 @@
+@@ -1699,6 +1993,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -478,17 +457,31 @@
  VARIABLE_NAME	INNODB_PURGE_BATCH_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	300
-@@ -1867,6 +2231,48 @@
+@@ -1867,6 +2217,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_SCHED_PRIORITY_CLEANER
++SESSION_VALUE	NULL
++GLOBAL_VALUE	19
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	19
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Nice value for the cleaner and LRU manager thread scheduling
++NUMERIC_MIN_VALUE	0
++NUMERIC_MAX_VALUE	39
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	REQUIRED
 +VARIABLE_NAME	INNODB_SCHED_PRIORITY_IO
 +SESSION_VALUE	NULL
 +GLOBAL_VALUE	19
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	19
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Nice value for the I/O handler thread scheduling
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	39
@@ -502,7 +495,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	19
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Nice value for the master thread scheduling
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	39
@@ -516,7 +509,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	19
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Nice value for the purge thread scheduling
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	39
@@ -537,7 +530,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	10
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS.
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	1000
@@ -551,7 +544,7 @@
 +GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 +DEFAULT_VALUE	0
 +VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 +VARIABLE_COMMENT	Whether to show records locked in SHOW INNODB STATUS.
 +NUMERIC_MIN_VALUE	0
 +NUMERIC_MAX_VALUE	1
@@ -657,13 +650,7 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2331,12 +2821,12 @@
- COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	INNODB_VERSION
- SESSION_VALUE	NULL
--GLOBAL_VALUE	5.6.25
-+GLOBAL_VALUE	5.6.24-72.2
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+@@ -2336,7 +2826,7 @@
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	VARCHAR
@@ -672,3 +659,21 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
+@@ -2360,3 +2850,17 @@
+ 
+ select * from information_schema.system_variables
+ where variable_name = 'innodb_adaptive_hash_index_partitions';
++VARIABLE_NAME	INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
++SESSION_VALUE	NULL
++GLOBAL_VALUE	1
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	1
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
++VARIABLE_COMMENT	Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
++NUMERIC_MIN_VALUE	1
++NUMERIC_MAX_VALUE	<value equals the word size>
++NUMERIC_BLOCK_SIZE	0
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	REQUIRED
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 18f682b..a026758 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -1,9 +1,9 @@
 select * from information_schema.system_variables
 where variable_name like 'innodb%' and
 variable_name not in (
-'innodb_disallow_writes',           # only available WITH_WSREP
-'innodb_sched_priority_cleaner',    # linux only
-'innodb_use_native_aio')            # default value depends on OS
+'innodb_adaptive_hash_index_partitions',  # max value is 32/64 depending on the word_size, see below
+'innodb_disallow_writes',                 # only available WITH_WSREP
+'innodb_use_native_aio')                  # default value depends on OS
 order by variable_name;
 VARIABLE_NAME	INNODB_ADAPTIVE_FLUSHING
 SESSION_VALUE	NULL
@@ -53,7 +53,7 @@ GLOBAL_VALUE	150000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	150000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The upper limit of the sleep delay in usec. Value of 0 disables it.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000000
@@ -67,10 +67,10 @@ GLOBAL_VALUE	8388608
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8388608
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	DEPRECATED. This option may be removed in future releases, together with the option innodb_use_sys_malloc and with the InnoDB's internal memory allocator. Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.
 NUMERIC_MIN_VALUE	524288
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -81,7 +81,7 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	5
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Background commit interval in seconds
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1073741824
@@ -137,7 +137,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB API transaction isolation level
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	3
@@ -151,7 +151,7 @@ GLOBAL_VALUE	64
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	64
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Data file autoextend increment in megabytes
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
@@ -165,7 +165,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	The AUTOINC lock modes supported by InnoDB:               0 => Old style AUTOINC locking (for backward compatibility)                                           1 => New style AUTOINC locking                            2 => No AUTOINC locking (unsafe for SBR)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -179,10 +179,10 @@ GLOBAL_VALUE	3600
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	3600
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	check if spaces needs scrubbing every innodb_background_scrub_data_check_interval seconds
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -207,10 +207,10 @@ GLOBAL_VALUE	604800
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	604800
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	scrub spaces that were last scrubbed longer than  innodb_background_scrub_data_interval seconds ago
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -291,7 +291,7 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of buffer pool instances, set to higher value on high-end machines to increase scalability
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	64
@@ -347,10 +347,10 @@ GLOBAL_VALUE	8388608
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	The size of the memory buffer InnoDB uses to cache data and indexes of its tables.
 NUMERIC_MIN_VALUE	5242880
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1048576
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -361,7 +361,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
@@ -403,7 +403,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Debug flags for InnoDB change buffering (0=none, 2=crash at merge)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -417,7 +417,7 @@ GLOBAL_VALUE	25
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	25
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum on-disk size of change buffer in terms of percentage of the buffer pool.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	50
@@ -473,7 +473,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
@@ -501,7 +501,7 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	5
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
@@ -515,7 +515,7 @@ GLOBAL_VALUE	6
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	6
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Compression level used for zlib compression.  0 is no compression, 1 is fastest, 9 is best compression and default is 6.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	9
@@ -529,7 +529,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Percentage of empty space on a data page that can be reserved to make the page compressible.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	75
@@ -543,10 +543,10 @@ GLOBAL_VALUE	5000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	5000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -599,10 +599,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Default encryption key id used for table encryption.
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -641,7 +641,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many records of space defragmentation should leave on the page. This variable, together with innodb_defragment_fill_factor, is introduced so defragmentation won't pack the page too full and cause page split on the next insert on every page. The variable indicating more defragmentation gain is the one effective.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100
@@ -655,7 +655,7 @@ GLOBAL_VALUE	40
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	40
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Do not defragment a single index more than this number of time per second.This controls the number of time defragmentation thread can request X_LOCK on an index. Defragmentation thread will check whether 1/defragment_frequency (s) has passed since it worked on this index last time, and put the index back to the queue if not enough time has passed. The actual frequency can only be lower than this given number.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
@@ -669,7 +669,7 @@ GLOBAL_VALUE	7
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	7
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of pages considered at once when merging multiple pages to defragment
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	32
@@ -683,10 +683,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many defragment stats changes there are before the stats are written to persistent storage. Set to 0 meaning disable defragment stats tracking.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -739,7 +739,7 @@ GLOBAL_VALUE	120
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	120
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of pages reserved in doublewrite buffer for batch flushing
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	127
@@ -753,10 +753,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Key rotation - re-encrypt in background all pages that were encrypted with a key that many (or more) versions behind
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -767,10 +767,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Use this many iops for background key rotation
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -781,10 +781,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of threads performing background key rotation and scrubbing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -823,7 +823,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -837,10 +837,10 @@ GLOBAL_VALUE	600
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	600
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of seconds that semaphore times out in InnoDB.
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -907,10 +907,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Make the first page of the given tablespace dirty.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -921,7 +921,7 @@ GLOBAL_VALUE	30
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of iterations over which the background flushing is averaged.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
@@ -935,7 +935,7 @@ GLOBAL_VALUE	3
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Write and flush logs every (n) second.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2700
@@ -949,7 +949,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	3
@@ -977,7 +977,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -1019,7 +1019,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Helps to save your data in case the disk image of the database becomes corrupt.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	6
@@ -1033,7 +1033,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Kills the server during crash recovery.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10
@@ -1061,7 +1061,7 @@ GLOBAL_VALUE	8000000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8000000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search cache size in bytes
 NUMERIC_MIN_VALUE	1600000
 NUMERIC_MAX_VALUE	80000000
@@ -1103,7 +1103,7 @@ GLOBAL_VALUE	84
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	84
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search maximum token size in characters
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	84
@@ -1117,7 +1117,7 @@ GLOBAL_VALUE	3
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	3
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search minimum token size in characters
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16
@@ -1131,7 +1131,7 @@ GLOBAL_VALUE	2000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search number of words to optimize for each optimize table call 
 NUMERIC_MIN_VALUE	1000
 NUMERIC_MAX_VALUE	10000
@@ -1145,10 +1145,10 @@ GLOBAL_VALUE	2000000000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2000000000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search query result cache limit in bytes
 NUMERIC_MIN_VALUE	1000000
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1173,7 +1173,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	16
@@ -1187,7 +1187,7 @@ GLOBAL_VALUE	640000000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	640000000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Total memory allocated for InnoDB Fulltext Search cache
 NUMERIC_MIN_VALUE	32000000
 NUMERIC_MAX_VALUE	1600000000
@@ -1215,7 +1215,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
@@ -1257,10 +1257,10 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	200
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of IOPs the server can do. Tunes the background IO rate
 NUMERIC_MIN_VALUE	100
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1269,12 +1269,12 @@ VARIABLE_NAME	INNODB_IO_CAPACITY_MAX
 SESSION_VALUE	NULL
 GLOBAL_VALUE	2000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit to which innodb_io_capacity can be inflated.
 NUMERIC_MIN_VALUE	100
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1299,10 +1299,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Artificially limit the number of records per B-tree page (0=unlimited).
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1327,7 +1327,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1073741824
@@ -1341,10 +1341,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	8388608
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	The size of the buffer which InnoDB uses to write log to the log files on disk.
 NUMERIC_MIN_VALUE	262144
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1383,7 +1383,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of log files in the log group. InnoDB writes to the files in a circular fashion.
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	100
@@ -1397,10 +1397,10 @@ GLOBAL_VALUE	5242880
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	50331648
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Size of each log file in a log group.
 NUMERIC_MIN_VALUE	1048576
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1048576
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1425,10 +1425,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How deep to scan LRU to keep it clean
 NUMERIC_MIN_VALUE	100
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1467,10 +1467,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Desired maximum length of the purge queue (0 = no limit)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1481,7 +1481,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum delay of user threads in micro-seconds
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10000000
@@ -1495,7 +1495,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of identical copies of log groups we keep for the database. Currently this should be set to 1.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10
@@ -1565,7 +1565,7 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of multi-threaded flush threads
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	64
@@ -1579,7 +1579,7 @@ GLOBAL_VALUE	37
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	37
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Percentage of the buffer pool to reserve for 'old' blocks.
 NUMERIC_MIN_VALUE	5
 NUMERIC_MAX_VALUE	95
@@ -1593,10 +1593,10 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Move blocks to the 'new' end of the buffer pool if the first access was at least this many milliseconds ago. The timeout is disabled if 0.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1607,10 +1607,10 @@ GLOBAL_VALUE	134217728
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum modification log file size for online index creation
 NUMERIC_MIN_VALUE	65536
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1621,10 +1621,10 @@ GLOBAL_VALUE	400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	How many files at the maximum InnoDB keeps open at the same time.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1649,7 +1649,7 @@ GLOBAL_VALUE	16
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
@@ -1663,7 +1663,7 @@ GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Page size to use for all InnoDB tablespaces.
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	65536
@@ -1705,7 +1705,7 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of UNDO log pages to purge in one batch from the history list.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5000
@@ -1747,7 +1747,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Purge threads can be from 1 to 32. Default is 1.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	32
@@ -1775,7 +1775,7 @@ GLOBAL_VALUE	56
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	56
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	64
@@ -1789,7 +1789,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of background read I/O threads in InnoDB.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	64
@@ -1817,10 +1817,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Replication thread delay (ms) on the slave server if innodb_thread_concurrency is reached (0 by default)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1845,7 +1845,7 @@ GLOBAL_VALUE	128
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of undo logs to use (deprecated).
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
@@ -1859,10 +1859,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	An InnoDB page number.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1887,7 +1887,7 @@ GLOBAL_VALUE	256
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	256
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Background redo log scrubbing speed in bytes/sec
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	50000
@@ -1901,7 +1901,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Simulate compression failures.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	99
@@ -1915,7 +1915,7 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Memory buffer size for index creation
 NUMERIC_MIN_VALUE	65536
 NUMERIC_MAX_VALUE	67108864
@@ -1929,10 +1929,10 @@ GLOBAL_VALUE	6
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	6
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum delay between polling for a spin lock (6 by default)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1971,10 +1971,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of rows modified before we calculate new statistics (default 0 = current limits)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2013,10 +2013,10 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of leaf index pages to sample when calculating persistent statistics (by ANALYZE, default 20)
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2027,10 +2027,10 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Deprecated, use innodb_stats_transient_sample_pages instead
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2055,10 +2055,10 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of leaf index pages to sample when calculating transient statistics (if persistent statistics are not used, default 8)
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2125,7 +2125,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of the mutex/lock wait array.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
@@ -2139,10 +2139,10 @@ GLOBAL_VALUE	30
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Count of spin-loop rounds in InnoDB mutexes (30 by default)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2167,7 +2167,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
@@ -2181,7 +2181,7 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000000
@@ -2209,7 +2209,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Debug flags for InnoDB to limit TRX_RSEG_N_SLOTS for trx_rsegf_undo_find_free()
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1024
@@ -2237,7 +2237,7 @@ GLOBAL_VALUE	128
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of undo logs to use.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
@@ -2251,7 +2251,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of undo tablespaces to use. 
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	126
@@ -2331,7 +2331,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_VERSION
 SESSION_VALUE	NULL
-GLOBAL_VALUE	5.6.25
+GLOBAL_VALUE	<InnoDB version>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
@@ -2349,7 +2349,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of background write I/O threads in InnoDB.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	64
@@ -2357,3 +2357,6 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+
+select * from information_schema.system_variables
+where variable_name = 'innodb_adaptive_hash_index_partitions';
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
deleted file mode 100644
index 654c7ea..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+++ /dev/null
@@ -1,1226 +0,0 @@
---- ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded.result	2015-06-03 00:15:21.000000000 +0200
-+++ ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.reject	2015-06-03 09:12:40.000000000 +0200
-@@ -57,7 +57,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Auto-increment columns are incremented by this
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -71,7 +71,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Offset added to Auto-increment columns. Used when auto-increment-increment != 1
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -85,7 +85,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -144,7 +144,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -169,10 +169,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -183,10 +183,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -242,7 +242,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -256,7 +256,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -449,7 +449,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	31536000
-@@ -505,7 +505,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	15
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Long search depth for the two-step deadlock detection
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	33
-@@ -519,7 +519,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Short search depth for the two-step deadlock detection
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	32
-@@ -533,7 +533,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50000000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Long timeout for the two-step deadlock detection (in microseconds)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -547,7 +547,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Short timeout for the two-step deadlock detection (in microseconds)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -603,7 +603,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The default week format used by WEEK() functions
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	7
-@@ -617,7 +617,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -631,7 +631,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How long a INSERT DELAYED thread should wait for INSERT statements before terminating
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -645,7 +645,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -673,7 +673,7 @@
- GLOBAL_VALUE_ORIGIN	SQL
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Precision of the result of '/' operator will be increased on that value
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	30
-@@ -757,7 +757,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	99
-@@ -785,7 +785,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of connections on extra-port
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100000
-@@ -827,7 +827,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	A dedicated thread is created to flush all tables at the given interval
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	31536000
-@@ -869,7 +869,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	84
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	84
-@@ -883,7 +883,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	84
-@@ -897,7 +897,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of best matches to use for query expansion
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -956,7 +956,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
- NUMERIC_MIN_VALUE	4
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1107,7 +1107,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -1135,7 +1135,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How many host names should be cached to avoid resolving.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	65536
-@@ -1247,7 +1247,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	28800
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the server waits for activity on an interactive connection before closing it
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -1278,7 +1278,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the buffer that is used for joins
- NUMERIC_MIN_VALUE	128
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	128
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1303,7 +1303,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	8
-@@ -1541,7 +1541,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	31536000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -1639,7 +1639,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -1667,7 +1667,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -1709,7 +1709,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max packet length to send to or receive from the server
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -1719,14 +1719,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MAX_BINLOG_CACHE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709547520
-+GLOBAL_VALUE	4294963200
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709547520
-+DEFAULT_VALUE	4294963200
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the total size of the transactional cache
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1737,7 +1737,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Binary log will be rotated automatically when the size exceeds this value.
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	1073741824
-@@ -1747,14 +1747,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MAX_BINLOG_STMT_CACHE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709547520
-+GLOBAL_VALUE	4294963200
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709547520
-+DEFAULT_VALUE	4294963200
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the total size of the statement cache
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1765,7 +1765,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	151
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of simultaneous clients allowed
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100000
-@@ -1779,7 +1779,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If there is more than this number of interrupted connections from a host this host will be blocked from further connections
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -1793,7 +1793,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -1821,7 +1821,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	64
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of errors/warnings to store for a statement
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	65535
-@@ -1838,7 +1838,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Don't allow creation of heap tables bigger than this
- NUMERIC_MIN_VALUE	16384
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1849,7 +1849,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -1877,7 +1877,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of bytes in sorted records
- NUMERIC_MIN_VALUE	4
- NUMERIC_MAX_VALUE	8388608
-@@ -1891,7 +1891,7 @@
- GLOBAL_VALUE_ORIGIN	AUTO
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -1905,7 +1905,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16382
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of prepared statements in the server
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -1919,7 +1919,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit assumed max number of seeks when looking up rows based on a key
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -1933,7 +1933,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
- NUMERIC_MIN_VALUE	4
- NUMERIC_MAX_VALUE	8388608
-@@ -1947,7 +1947,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum stored procedure recursion depth
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -1975,7 +1975,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused, will be removed.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2003,7 +2003,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	After this many write locks, allow some read locks to run in between
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2017,7 +2017,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1048576
-@@ -2031,7 +2031,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -2045,7 +2045,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't write queries to slow log that examine fewer rows than that
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -2059,7 +2059,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	262144
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of buffer to use when using MRR with range access
- NUMERIC_MIN_VALUE	8192
- NUMERIC_MAX_VALUE	2147483647
-@@ -2073,10 +2073,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	256
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2087,7 +2087,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Block size to be used for MyISAM index pages
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	16384
-@@ -2101,7 +2101,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	6
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Default pointer size to be used for MyISAM tables
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	7
-@@ -2111,9 +2111,9 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	9223372036853727232
-+GLOBAL_VALUE	2146435072
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	9223372036853727232
-+DEFAULT_VALUE	2146435072
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
-@@ -2125,14 +2125,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MYISAM_MMAP_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709551615
-+GLOBAL_VALUE	4294967295
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709551615
-+DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
- NUMERIC_MIN_VALUE	7
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -2157,10 +2157,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If larger than 1, when repairing a MyISAM table all indexes will be created in parallel, with one thread per index. The value of 1 disables parallel repair
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2174,7 +2174,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2227,7 +2227,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Buffer length for TCP/IP and socket communication
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1048576
-@@ -2241,7 +2241,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of seconds to wait for more data from a connection before aborting the read
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -2255,7 +2255,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If a read on a communication port is interrupted, retry this many times before giving up
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2269,7 +2269,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	60
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of seconds to wait for a block to be written to a connection before aborting the write
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -2339,7 +2339,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1
-@@ -2353,7 +2353,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	62
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	63
-@@ -2367,7 +2367,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls number of record samples to check condition selectivity
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	4294967295
-@@ -2395,7 +2395,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	5
-@@ -2423,7 +2423,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2437,7 +2437,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Size of the statement digest. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	200
-@@ -2451,7 +2451,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2465,7 +2465,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2479,7 +2479,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2493,7 +2493,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2507,7 +2507,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2521,7 +2521,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2535,7 +2535,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2549,7 +2549,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	80
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of condition instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2563,7 +2563,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2577,7 +2577,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of file instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2591,7 +2591,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32768
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of opened instrumented files.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -2605,7 +2605,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2619,7 +2619,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	200
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of mutex instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2633,7 +2633,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	104857600
-@@ -2647,7 +2647,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	40
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rwlock instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2661,7 +2661,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	104857600
-@@ -2675,7 +2675,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of socket instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2689,7 +2689,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2703,7 +2703,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of stage instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2717,7 +2717,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	178
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of statement instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2731,7 +2731,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2745,7 +2745,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2759,7 +2759,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of thread instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2773,7 +2773,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2787,7 +2787,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2801,7 +2801,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1024
-@@ -2815,7 +2815,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -2829,7 +2829,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2899,7 +2899,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32768
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -2927,7 +2927,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	15
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit of query profiling memory
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -2941,7 +2941,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -2997,10 +2997,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION ONLY
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	This variable is for internal server use
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3011,7 +3011,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for query parsing and execution
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -3025,7 +3025,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't cache results that are bigger than this
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3039,7 +3039,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3056,7 +3056,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The memory allocated to store results from old queries
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3109,7 +3109,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	24576
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Persistent buffer for query parsing and execution
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -3123,7 +3123,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	4294967295
-@@ -3137,7 +3137,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	131072
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
- NUMERIC_MIN_VALUE	8192
- NUMERIC_MAX_VALUE	2147483647
-@@ -3165,7 +3165,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	262144
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	2147483647
-@@ -3179,10 +3179,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8388608
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3221,7 +3221,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3319,7 +3319,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -3333,7 +3333,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	31536000
-@@ -3392,7 +3392,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
- NUMERIC_MIN_VALUE	1024
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3669,7 +3669,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	256
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	524288
-@@ -3739,7 +3739,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	400
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of cached table definitions
- NUMERIC_MIN_VALUE	400
- NUMERIC_MAX_VALUE	524288
-@@ -3753,7 +3753,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	400
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of cached open tables
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	524288
-@@ -3767,7 +3767,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How many threads we should keep in a cache for reuse
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -3781,7 +3781,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	512
-@@ -3896,7 +3896,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
- NUMERIC_MIN_VALUE	1024
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3907,7 +3907,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8192
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	134217728
-@@ -3921,7 +3921,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	134217728
-@@ -4019,7 +4019,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	28800
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -4123,7 +4123,7 @@
- COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	OPEN_FILES_LIMIT
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -4136,7 +4136,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -4146,7 +4146,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -4231,7 +4231,7 @@
- VARIABLE_NAME	LOG_TC_SIZE
- GLOBAL_VALUE_ORIGIN	AUTO
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of transaction coordinator log.
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,win.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,win.rdiff
new file mode 100644
index 0000000..e993231
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,win.rdiff
@@ -0,0 +1,90 @@
+--- suite/sys_vars/r/sysvars_server_embedded.result	2015-08-05 17:22:49.437267900 +0300
++++ suite/sys_vars/r/sysvars_server_embedded.reject	2015-08-05 17:51:37.881752500 +0300
+@@ -1021,7 +1021,7 @@
+ COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	HAVE_CRYPT
+ SESSION_VALUE	NULL
+-GLOBAL_VALUE	YES
++GLOBAL_VALUE	NO
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ DEFAULT_VALUE	NULL
+ VARIABLE_SCOPE	GLOBAL
+@@ -1429,7 +1429,7 @@
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	OFF
++DEFAULT_VALUE	NULL
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	BOOLEAN
+ VARIABLE_COMMENT	Enable support for large pages
+@@ -1438,7 +1438,7 @@
+ NUMERIC_BLOCK_SIZE	NULL
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	YES
+-COMMAND_LINE_ARGUMENT	OPTIONAL
++COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	LARGE_PAGE_SIZE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	0
+@@ -1537,20 +1537,6 @@
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
+-VARIABLE_NAME	LOCKED_IN_MEMORY
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	OFF
+-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	NULL
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BOOLEAN
+-VARIABLE_COMMENT	Whether mysqld was locked in memory with --memlock
+-NUMERIC_MIN_VALUE	NULL
+-NUMERIC_MAX_VALUE	NULL
+-NUMERIC_BLOCK_SIZE	NULL
+-ENUM_VALUE_LIST	OFF,ON
+-READ_ONLY	YES
+-COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	LOCK_WAIT_TIMEOUT
+ SESSION_VALUE	31536000
+ GLOBAL_VALUE	31536000
+@@ -2223,6 +2209,20 @@
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	NAMED_PIPE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Enable the named pipe (NT)
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	OFF,ON
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	NET_BUFFER_LENGTH
+ SESSION_VALUE	16384
+ GLOBAL_VALUE	16384
+@@ -3868,7 +3868,7 @@
+ DEFAULT_VALUE	
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	VARCHAR
+-VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a colon (:), in this case they are used in a round-robin fashion
++VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a semicolon (;), in this case they are used in a round-robin fashion
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -4010,7 +4010,7 @@
+ VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+ VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
+ NUMERIC_MIN_VALUE	1
+-NUMERIC_MAX_VALUE	31536000
++NUMERIC_MAX_VALUE	2147483
+ NUMERIC_BLOCK_SIZE	1
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 3c232d6..259f986 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -14,9 +14,11 @@ variable_name not in (
 'large_files_support', 'log_tc_size',
 'lower_case_file_system',
 'lower_case_table_names',
+'myisam_max_sort_file_size',
 'open_files_limit',
 'rand_seed1',
 'rand_seed2',
+'rowid_merge_buff_size',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -57,7 +59,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Auto-increment columns are incremented by this
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -71,7 +73,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Offset added to Auto-increment columns. Used when auto-increment-increment != 1
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -85,7 +87,7 @@ GLOBAL_VALUE	150
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	150
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -141,10 +143,10 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -169,10 +171,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -183,10 +185,10 @@ GLOBAL_VALUE	100000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -253,10 +255,10 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -267,10 +269,10 @@ GLOBAL_VALUE	8388608
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8388608
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -463,7 +465,7 @@ GLOBAL_VALUE	60
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	31536000
@@ -519,7 +521,7 @@ GLOBAL_VALUE	15
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	15
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Long search depth for the two-step deadlock detection
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	33
@@ -533,7 +535,7 @@ GLOBAL_VALUE	4
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Short search depth for the two-step deadlock detection
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	32
@@ -547,10 +549,10 @@ GLOBAL_VALUE	50000000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50000000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Long timeout for the two-step deadlock detection (in microseconds)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -561,10 +563,10 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Short timeout for the two-step deadlock detection (in microseconds)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -617,7 +619,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The default week format used by WEEK() functions
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	7
@@ -631,10 +633,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -645,7 +647,7 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How long a INSERT DELAYED thread should wait for INSERT statements before terminating
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -659,10 +661,10 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -687,7 +689,7 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	SQL
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Precision of the result of '/' operator will be increased on that value
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	30
@@ -743,10 +745,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of errors that resulted from the last statement that generated messages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -757,10 +759,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum number of rows a subquery may examine in order to be executed during optimization and used for constant optimization
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -771,7 +773,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	99
@@ -799,7 +801,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of connections on extra-port
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100000
@@ -813,10 +815,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Extra port number to use for tcp connections in a one-thread-per-connection manner. 0 means don't use another port
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -841,7 +843,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	A dedicated thread is created to flush all tables at the given interval
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	31536000
@@ -883,7 +885,7 @@ GLOBAL_VALUE	84
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	84
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	84
@@ -897,7 +899,7 @@ GLOBAL_VALUE	4
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	84
@@ -911,7 +913,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of best matches to use for query expansion
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
@@ -967,10 +969,10 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
 NUMERIC_MIN_VALUE	4
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -981,10 +983,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Used with global transaction ID to identify logically independent replication streams. When events can propagate through multiple parallel paths (for example multiple masters), each independent source server must use a distinct domain_id. For simple tree-shaped replication topologies, it can be left at its default, 0.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -995,10 +997,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Internal server usage, for replication with global transaction id. When set, next event group logged to the binary log will use this sequence number, not generate a new one, thus allowing to preserve master's GTID in slave's binlog.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1121,7 +1123,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
@@ -1149,7 +1151,7 @@ GLOBAL_VALUE	128
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many host names should be cached to avoid resolving.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65536
@@ -1163,10 +1165,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synonym for the last_insert_id variable
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1247,10 +1249,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The value to be used by the following INSERT or ALTER TABLE statement when inserting an AUTO_INCREMENT value
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1261,7 +1263,7 @@ GLOBAL_VALUE	28800
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	28800
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the server waits for activity on an interactive connection before closing it
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -1275,7 +1277,7 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Whether there is an active transaction
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1
@@ -1289,10 +1291,10 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer that is used for joins
 NUMERIC_MIN_VALUE	128
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	128
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1303,10 +1305,10 @@ GLOBAL_VALUE	2097152
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2097152
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The limit of the space for all join buffers used by a query
 NUMERIC_MIN_VALUE	2048
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	2048
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1317,7 +1319,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	8
@@ -1345,7 +1347,7 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1359,7 +1361,7 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1373,7 +1375,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The default size of key cache blocks
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1387,7 +1389,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum percentage of warm blocks in key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1401,7 +1403,7 @@ GLOBAL_VALUE	512
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	512
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of MyISAM files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open MyISAM files.
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1415,7 +1417,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of segments in a key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1443,10 +1445,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If large page support is enabled, this shows the size of memory pages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1457,10 +1459,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The value to be returned from LAST_INSERT_ID()
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1555,7 +1557,7 @@ GLOBAL_VALUE	31536000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	31536000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -1653,10 +1655,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1681,10 +1683,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1723,7 +1725,7 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max packet length to send to or receive from the server
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -1733,14 +1735,14 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_BINLOG_CACHE_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709547520
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709547520
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the total size of the transactional cache
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1751,7 +1753,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Binary log will be rotated automatically when the size exceeds this value.
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	1073741824
@@ -1761,14 +1763,14 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_BINLOG_STMT_CACHE_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709547520
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709547520
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the total size of the statement cache
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1779,7 +1781,7 @@ GLOBAL_VALUE	151
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	151
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of simultaneous clients allowed
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100000
@@ -1793,10 +1795,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If there is more than this number of interrupted connections from a host this host will be blocked from further connections
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1807,7 +1809,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -1821,7 +1823,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum length considered for digest text.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -1835,7 +1837,7 @@ GLOBAL_VALUE	64
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	64
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of errors/warnings to store for a statement
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65535
@@ -1849,10 +1851,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't allow creation of heap tables bigger than this
 NUMERIC_MIN_VALUE	16384
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1863,7 +1865,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -1872,15 +1874,15 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	MAX_JOIN_SIZE
-SESSION_VALUE	18446744073709551615
-GLOBAL_VALUE	18446744073709551615
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Joins that are probably going to read more than max_join_size records return an error
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1891,7 +1893,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of bytes in sorted records
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	8388608
@@ -1905,10 +1907,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead.
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1919,7 +1921,7 @@ GLOBAL_VALUE	16382
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16382
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of prepared statements in the server
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -1928,15 +1930,15 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_SEEKS_FOR_KEY
-SESSION_VALUE	4294967295
-GLOBAL_VALUE	4294967295
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4294967295
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit assumed max number of seeks when looking up rows based on a key
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1947,7 +1949,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	8388608
@@ -1961,7 +1963,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum stored procedure recursion depth
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
@@ -1989,10 +1991,10 @@ GLOBAL_VALUE	32
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused, will be removed.
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2003,24 +2005,24 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	The maximum number of active connections for a single user (0 = no limit)
 NUMERIC_MIN_VALUE	-1
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_WRITE_LOCK_COUNT
 SESSION_VALUE	NULL
-GLOBAL_VALUE	4294967295
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4294967295
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	After this many write locks, allow some read locks to run in between
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2031,7 +2033,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1048576
@@ -2045,7 +2047,7 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
@@ -2059,10 +2061,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't write queries to slow log that examine fewer rows than that
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2073,10 +2075,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	262144
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of buffer to use when using MRR with range access
 NUMERIC_MIN_VALUE	8192
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2087,10 +2089,10 @@ GLOBAL_VALUE	256
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	256
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2101,7 +2103,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Block size to be used for MyISAM index pages
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	16384
@@ -2115,7 +2117,7 @@ GLOBAL_VALUE	6
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	6
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Default pointer size to be used for MyISAM tables
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	7
@@ -2123,30 +2125,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
-SESSION_VALUE	NULL
-GLOBAL_VALUE	9223372036853727232
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	9223372036853727232
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
-NUMERIC_BLOCK_SIZE	1048576
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_MMAP_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709551615
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
 NUMERIC_MIN_VALUE	7
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -2171,10 +2159,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If larger than 1, when repairing a MyISAM table all indexes will be created in parallel, with one thread per index. The value of 1 disables parallel repair
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2185,10 +2173,10 @@ GLOBAL_VALUE	134216704
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	134216704
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2241,7 +2229,7 @@ GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Buffer length for TCP/IP and socket communication
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1048576
@@ -2255,7 +2243,7 @@ GLOBAL_VALUE	30
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for more data from a connection before aborting the read
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -2269,10 +2257,10 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If a read on a communication port is interrupted, retry this many times before giving up
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2283,7 +2271,7 @@ GLOBAL_VALUE	60
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	60
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for a block to be written to a connection before aborting the write
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -2353,7 +2341,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1
@@ -2367,7 +2355,7 @@ GLOBAL_VALUE	62
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	62
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	63
@@ -2381,10 +2369,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls number of record samples to check condition selectivity
 NUMERIC_MIN_VALUE	10
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2409,7 +2397,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5
@@ -2437,7 +2425,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2451,7 +2439,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Size of the statement digest. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	200
@@ -2465,7 +2453,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2479,7 +2467,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2493,7 +2481,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2507,7 +2495,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2521,7 +2509,7 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2535,7 +2523,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2549,7 +2537,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2563,7 +2551,7 @@ GLOBAL_VALUE	80
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	80
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of condition instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2577,7 +2565,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2591,7 +2579,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of file instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2605,7 +2593,7 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of opened instrumented files.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -2619,7 +2607,7 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2633,7 +2621,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	200
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of mutex instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2647,7 +2635,7 @@ GLOBAL_VALUE	5000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	104857600
@@ -2661,7 +2649,7 @@ GLOBAL_VALUE	40
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	40
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rwlock instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2675,7 +2663,7 @@ GLOBAL_VALUE	5000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	104857600
@@ -2689,7 +2677,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of socket instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2703,7 +2691,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2717,7 +2705,7 @@ GLOBAL_VALUE	150
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	150
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of stage instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2731,7 +2719,7 @@ GLOBAL_VALUE	178
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	178
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of statement instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2745,7 +2733,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2759,7 +2747,7 @@ GLOBAL_VALUE	500
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2773,7 +2761,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of thread instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2787,7 +2775,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2801,7 +2789,7 @@ GLOBAL_VALUE	2048
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2815,7 +2803,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1024
@@ -2829,7 +2817,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -2843,7 +2831,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2899,10 +2887,10 @@ GLOBAL_VALUE	MASTER_MYPORT
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Port number to use for connection or 0 to default to, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306), whatever comes first
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -2913,7 +2901,7 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -2941,7 +2929,7 @@ GLOBAL_VALUE	15
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	15
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit of query profiling memory
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
@@ -2955,10 +2943,10 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	5
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2969,10 +2957,10 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The version of the client/server protocol used by the MySQL server
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3011,10 +2999,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	This variable is for internal server use
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3025,10 +3013,10 @@ GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for query parsing and execution
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3039,10 +3027,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't cache results that are bigger than this
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3053,10 +3041,10 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	8
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3067,10 +3055,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The memory allocated to store results from old queries
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3123,10 +3111,10 @@ GLOBAL_VALUE	24576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	24576
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Persistent buffer for query parsing and execution
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3137,10 +3125,10 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3151,10 +3139,10 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
 NUMERIC_MIN_VALUE	8192
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3179,24 +3167,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	262144
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	2147483647
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
-SESSION_VALUE	8388608
-GLOBAL_VALUE	8388608
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	8388608
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3235,10 +3209,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3333,7 +3307,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -3347,7 +3321,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	31536000
@@ -3403,10 +3377,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	2097152
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3538,15 +3512,15 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SQL_SELECT_LIMIT
-SESSION_VALUE	18446744073709551615
-GLOBAL_VALUE	18446744073709551615
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum number of rows to return from SELECT statements
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3683,7 +3657,7 @@ GLOBAL_VALUE	256
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	256
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	524288
@@ -3711,10 +3685,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush binary log to disk after every #th event. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3739,10 +3713,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush master info to disk after every #th event. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3753,7 +3727,7 @@ GLOBAL_VALUE	400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	400
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of cached table definitions
 NUMERIC_MIN_VALUE	400
 NUMERIC_MAX_VALUE	524288
@@ -3767,7 +3741,7 @@ GLOBAL_VALUE	400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	400
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of cached open tables
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	524288
@@ -3781,7 +3755,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many threads we should keep in a cache for reuse
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -3795,7 +3769,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	512
@@ -3823,10 +3797,10 @@ GLOBAL_VALUE	294912
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	294912
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The stack size for each thread
 NUMERIC_MIN_VALUE	131072
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3854,7 +3828,7 @@ VARIABLE_SCOPE	SESSION ONLY
 VARIABLE_TYPE	DOUBLE
 VARIABLE_COMMENT	Set the time for this client
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3907,10 +3881,10 @@ GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3921,7 +3895,7 @@ GLOBAL_VALUE	8192
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8192
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	134217728
@@ -3935,7 +3909,7 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	134217728
@@ -4033,7 +4007,7 @@ GLOBAL_VALUE	28800
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	28800
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -4047,14 +4021,15 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of errors, warnings, and notes that resulted from the last statement that generated messages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+
 select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
 NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE,
 ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
@@ -4127,7 +4102,7 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LOWER_CASE_TABLE_NAMES
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If set to 1 table names are stored in lowercase on disk and table names will be case-insensitive.  Should be set to 2 if you are using a case insensitive file system
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -4137,30 +4112,30 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	OPEN_FILES_LIMIT
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	RAND_SEED1
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	RAND_SEED2
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4235,19 +4210,38 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+
 select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
 VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
 from information_schema.system_variables
 where variable_name in (
-'log_tc_size'
+'log_tc_size',
+'myisam_max_sort_file_size',
+'rowid_merge_buff_size'
         )
 order by variable_name;
 VARIABLE_NAME	LOG_TC_SIZE
 GLOBAL_VALUE_ORIGIN	AUTO
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of transaction coordinator log.
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 set global div_precision_increment=default;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
deleted file mode 100644
index 9366876..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
+++ /dev/null
@@ -1,1262 +0,0 @@
---- suite/sys_vars/r/sysvars_server_notembedded.result
-+++ suite/sys_vars/r/sysvars_server_notembedded,32bit.reject
-@@ -57,7 +57,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Auto-increment columns are incremented by this
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -71,7 +71,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Offset added to Auto-increment columns. Used when auto-increment-increment != 1
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -85,7 +85,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	65535
-@@ -144,7 +144,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -169,10 +169,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -183,10 +183,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -256,7 +256,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -270,7 +270,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -463,7 +463,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	31536000
-@@ -519,7 +519,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	15
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Long search depth for the two-step deadlock detection
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	33
-@@ -533,7 +533,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Short search depth for the two-step deadlock detection
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	32
-@@ -547,7 +547,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50000000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Long timeout for the two-step deadlock detection (in microseconds)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -561,7 +561,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Short timeout for the two-step deadlock detection (in microseconds)
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -631,7 +631,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The default week format used by WEEK() functions
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	7
-@@ -645,7 +645,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -659,7 +659,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	300
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How long a INSERT DELAYED thread should wait for INSERT statements before terminating
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -673,7 +673,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1000
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -701,7 +701,7 @@
- GLOBAL_VALUE_ORIGIN	SQL
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Precision of the result of '/' operator will be increased on that value
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	30
-@@ -799,7 +799,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	99
-@@ -827,7 +827,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of connections on extra-port
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100000
-@@ -869,7 +869,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	A dedicated thread is created to flush all tables at the given interval
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	31536000
-@@ -911,7 +911,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	84
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	84
-@@ -925,7 +925,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	84
-@@ -939,7 +939,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of best matches to use for query expansion
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -998,7 +998,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
- NUMERIC_MIN_VALUE	4
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1233,7 +1233,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -1261,7 +1261,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	128
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How many host names should be cached to avoid resolving.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	65536
-@@ -1373,7 +1373,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	28800
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the server waits for activity on an interactive connection before closing it
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -1404,7 +1404,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The size of the buffer that is used for joins
- NUMERIC_MIN_VALUE	128
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	128
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1429,7 +1429,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	8
-@@ -1681,7 +1681,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	31536000
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -1821,7 +1821,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -1849,7 +1849,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -1905,7 +1905,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max packet length to send to or receive from the server
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -1915,14 +1915,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MAX_BINLOG_CACHE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709547520
-+GLOBAL_VALUE	4294963200
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709547520
-+DEFAULT_VALUE	4294963200
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the total size of the transactional cache
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1933,7 +1933,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Binary log will be rotated automatically when the size exceeds this value.
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	1073741824
-@@ -1943,14 +1943,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MAX_BINLOG_STMT_CACHE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709547520
-+GLOBAL_VALUE	4294963200
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709547520
-+DEFAULT_VALUE	4294963200
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the total size of the statement cache
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	4096
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -1961,7 +1961,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	151
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of simultaneous clients allowed
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	100000
-@@ -1975,7 +1975,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If there is more than this number of interrupted connections from a host this host will be blocked from further connections
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -1989,7 +1989,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -2017,7 +2017,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	64
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of errors/warnings to store for a statement
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	65535
-@@ -2034,7 +2034,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Don't allow creation of heap tables bigger than this
- NUMERIC_MIN_VALUE	16384
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2045,7 +2045,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	20
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -2073,7 +2073,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of bytes in sorted records
- NUMERIC_MIN_VALUE	4
- NUMERIC_MAX_VALUE	8388608
-@@ -2087,7 +2087,7 @@
- GLOBAL_VALUE_ORIGIN	AUTO
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -2101,7 +2101,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16382
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of prepared statements in the server
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -2129,7 +2129,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit assumed max number of seeks when looking up rows based on a key
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2143,7 +2143,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
- NUMERIC_MIN_VALUE	4
- NUMERIC_MAX_VALUE	8388608
-@@ -2157,7 +2157,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum stored procedure recursion depth
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	255
-@@ -2185,7 +2185,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused, will be removed.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2213,7 +2213,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	After this many write locks, allow some read locks to run in between
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2227,7 +2227,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1048576
-@@ -2241,7 +2241,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Unused
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1024
-@@ -2255,7 +2255,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't write queries to slow log that examine fewer rows than that
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -2269,7 +2269,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	262144
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of buffer to use when using MRR with range access
- NUMERIC_MIN_VALUE	8192
- NUMERIC_MAX_VALUE	2147483647
-@@ -2283,10 +2283,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	256
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2297,7 +2297,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1024
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Block size to be used for MyISAM index pages
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	16384
-@@ -2311,7 +2311,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	6
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Default pointer size to be used for MyISAM tables
- NUMERIC_MIN_VALUE	2
- NUMERIC_MAX_VALUE	7
-@@ -2321,9 +2321,9 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	9223372036853727232
-+GLOBAL_VALUE	2146435072
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	9223372036853727232
-+DEFAULT_VALUE	2146435072
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
-@@ -2335,14 +2335,14 @@
- COMMAND_LINE_ARGUMENT	REQUIRED
- VARIABLE_NAME	MYISAM_MMAP_SIZE
- SESSION_VALUE	NULL
--GLOBAL_VALUE	18446744073709551615
-+GLOBAL_VALUE	4294967295
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
--DEFAULT_VALUE	18446744073709551615
-+DEFAULT_VALUE	4294967295
- VARIABLE_SCOPE	GLOBAL
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
- NUMERIC_MIN_VALUE	7
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
-@@ -2367,10 +2367,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If larger than 1, when repairing a MyISAM table all indexes will be created in parallel, with one thread per index. The value of 1 disables parallel repair
- NUMERIC_MIN_VALUE	1
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2384,7 +2384,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
- NUMERIC_MIN_VALUE	4096
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -2437,7 +2437,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Buffer length for TCP/IP and socket communication
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1048576
-@@ -2451,7 +2451,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	30
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of seconds to wait for more data from a connection before aborting the read
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -2465,7 +2465,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If a read on a communication port is interrupted, retry this many times before giving up
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	4294967295
-@@ -2479,7 +2479,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	60
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of seconds to wait for a block to be written to a connection before aborting the write
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -2549,7 +2549,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1
-@@ -2563,7 +2563,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	62
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	63
-@@ -2577,7 +2577,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls number of record samples to check condition selectivity
- NUMERIC_MIN_VALUE	10
- NUMERIC_MAX_VALUE	4294967295
-@@ -2605,7 +2605,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	5
-@@ -2633,7 +2633,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2647,7 +2647,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Size of the statement digest. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	200
-@@ -2661,7 +2661,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2675,7 +2675,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2689,7 +2689,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2703,7 +2703,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2717,7 +2717,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2731,7 +2731,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1024
-@@ -2745,7 +2745,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2759,7 +2759,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	80
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of condition instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2773,7 +2773,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2787,7 +2787,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of file instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2801,7 +2801,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32768
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of opened instrumented files.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -2815,7 +2815,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2829,7 +2829,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	200
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of mutex instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2843,7 +2843,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	104857600
-@@ -2857,7 +2857,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	40
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rwlock instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2871,7 +2871,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	104857600
-@@ -2885,7 +2885,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of socket instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2899,7 +2899,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2913,7 +2913,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	150
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of stage instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2927,7 +2927,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	178
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of statement instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2941,7 +2941,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2955,7 +2955,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2969,7 +2969,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	50
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of thread instruments.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	256
-@@ -2983,7 +2983,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -2997,7 +2997,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -3011,7 +3011,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1024
-@@ -3025,7 +3025,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1048576
-@@ -3039,7 +3039,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	-1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT
-+VARIABLE_TYPE	INT
- VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
- NUMERIC_MIN_VALUE	-1
- NUMERIC_MAX_VALUE	1048576
-@@ -3109,7 +3109,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	32768
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -3137,7 +3137,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	15
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit of query profiling memory
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
-@@ -3151,7 +3151,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	5
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3207,10 +3207,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION ONLY
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	This variable is for internal server use
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3221,7 +3221,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	16384
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for query parsing and execution
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -3235,7 +3235,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Don't cache results that are bigger than this
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3249,7 +3249,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3266,7 +3266,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The memory allocated to store results from old queries
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1024
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3319,7 +3319,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	24576
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Persistent buffer for query parsing and execution
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294967295
-@@ -3333,7 +3333,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
- NUMERIC_MIN_VALUE	4096
- NUMERIC_MAX_VALUE	4294967295
-@@ -3347,7 +3347,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	131072
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
- NUMERIC_MIN_VALUE	8192
- NUMERIC_MAX_VALUE	2147483647
-@@ -3375,7 +3375,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	262144
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	2147483647
-@@ -3655,10 +3655,10 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8388608
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	9223372036854775807
-+NUMERIC_MAX_VALUE	2147483647
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -3697,7 +3697,7 @@
- GLOBAL_VALUE_ORIGIN	CONFIG
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -3823,7 +3823,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16383
-@@ -3865,7 +3865,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	1073741824
-@@ -3893,7 +3893,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	131072
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	2147483647
-@@ -3921,7 +3921,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16383
-@@ -3977,7 +3977,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -4005,7 +4005,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	2
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	31536000
-@@ -4064,7 +4064,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
- NUMERIC_MIN_VALUE	1024
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -4355,7 +4355,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	256
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	524288
-@@ -4453,7 +4453,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	400
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of cached table definitions
- NUMERIC_MIN_VALUE	400
- NUMERIC_MAX_VALUE	524288
-@@ -4467,7 +4467,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	400
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of cached open tables
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	524288
-@@ -4481,7 +4481,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	How many threads we should keep in a cache for reuse
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	16384
-@@ -4495,7 +4495,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	10
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	512
-@@ -4680,7 +4680,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
- NUMERIC_MIN_VALUE	1024
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -4691,7 +4691,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	8192
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	134217728
-@@ -4705,7 +4705,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	4096
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	134217728
-@@ -4803,7 +4803,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	28800
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	31536000
-@@ -4907,7 +4907,7 @@
- COMMAND_LINE_ARGUMENT	OPTIONAL
- VARIABLE_NAME	OPEN_FILES_LIMIT
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	4294967295
-@@ -4920,7 +4920,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -4930,7 +4930,7 @@
- VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
- NUMERIC_MIN_VALUE	0
--NUMERIC_MAX_VALUE	18446744073709551615
-+NUMERIC_MAX_VALUE	4294967295
- NUMERIC_BLOCK_SIZE	1
- ENUM_VALUE_LIST	NULL
- READ_ONLY	NO
-@@ -5015,7 +5015,7 @@
- VARIABLE_NAME	LOG_TC_SIZE
- GLOBAL_VALUE_ORIGIN	AUTO
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Size of transaction coordinator log.
- ENUM_VALUE_LIST	NULL
- READ_ONLY	YES
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff
new file mode 100644
index 0000000..eee9d13
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff
@@ -0,0 +1,208 @@
+--- suite/sys_vars/r/sysvars_server_notembedded.result	2015-08-05 17:03:53.564530400 +0300
++++ suite/sys_vars/r/sysvars_server_notembedded.reject	2015-08-05 17:05:24.952635200 +0300
+@@ -1133,7 +1133,7 @@
+ COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	HAVE_CRYPT
+ SESSION_VALUE	NULL
+-GLOBAL_VALUE	YES
++GLOBAL_VALUE	NO
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ DEFAULT_VALUE	NULL
+ VARIABLE_SCOPE	GLOBAL
+@@ -1541,7 +1541,7 @@
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	OFF
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	OFF
++DEFAULT_VALUE	NULL
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	BOOLEAN
+ VARIABLE_COMMENT	Enable support for large pages
+@@ -1550,7 +1550,7 @@
+ NUMERIC_BLOCK_SIZE	NULL
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	YES
+-COMMAND_LINE_ARGUMENT	OPTIONAL
++COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	LARGE_PAGE_SIZE
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	0
+@@ -1663,20 +1663,6 @@
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
+-VARIABLE_NAME	LOCKED_IN_MEMORY
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	OFF
+-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	NULL
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BOOLEAN
+-VARIABLE_COMMENT	Whether mysqld was locked in memory with --memlock
+-NUMERIC_MIN_VALUE	NULL
+-NUMERIC_MAX_VALUE	NULL
+-NUMERIC_BLOCK_SIZE	NULL
+-ENUM_VALUE_LIST	OFF,ON
+-READ_ONLY	YES
+-COMMAND_LINE_ARGUMENT	NULL
+ VARIABLE_NAME	LOCK_WAIT_TIMEOUT
+ SESSION_VALUE	31536000
+ GLOBAL_VALUE	31536000
+@@ -2419,6 +2405,20 @@
+ ENUM_VALUE_LIST	OFF,ON
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	NAMED_PIPE
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Enable the named pipe (NT)
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	OFF,ON
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	OPTIONAL
+ VARIABLE_NAME	NET_BUFFER_LENGTH
+ SESSION_VALUE	16384
+ GLOBAL_VALUE	16384
+@@ -3679,6 +3679,34 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
++VARIABLE_NAME	SHARED_MEMORY
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Enable the shared memory
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	OFF,ON
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	SHARED_MEMORY_BASE_NAME
++SESSION_VALUE	NULL
++GLOBAL_VALUE	PATH
++GLOBAL_VALUE_ORIGIN	CONFIG
++DEFAULT_VALUE	
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	VARCHAR
++VARIABLE_COMMENT	Base name of shared memory
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	NULL
++READ_ONLY	YES
++COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	SKIP_EXTERNAL_LOCKING
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	ON
+@@ -4479,9 +4507,9 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	THREAD_HANDLING
+ SESSION_VALUE	NULL
+-GLOBAL_VALUE	one-thread-per-connection
++GLOBAL_VALUE	pool-of-threads
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	one-thread-per-connection
++DEFAULT_VALUE	pool-of-threads
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	ENUM
+ VARIABLE_COMMENT	Define threads usage for handling queries
+@@ -4491,20 +4519,6 @@
+ ENUM_VALUE_LIST	one-thread-per-connection,no-threads,pool-of-threads
+ READ_ONLY	YES
+ COMMAND_LINE_ARGUMENT	REQUIRED
+-VARIABLE_NAME	THREAD_POOL_IDLE_TIMEOUT
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	60
+-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	60
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+-VARIABLE_COMMENT	Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout
+-NUMERIC_MIN_VALUE	1
+-NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+-NUMERIC_BLOCK_SIZE	1
+-ENUM_VALUE_LIST	NULL
+-READ_ONLY	NO
+-COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	THREAD_POOL_MAX_THREADS
+ SESSION_VALUE	NULL
+ GLOBAL_VALUE	1000
+@@ -4519,44 +4533,16 @@
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+ COMMAND_LINE_ARGUMENT	REQUIRED
+-VARIABLE_NAME	THREAD_POOL_OVERSUBSCRIBE
++VARIABLE_NAME	THREAD_POOL_MIN_THREADS
+ SESSION_VALUE	NULL
+-GLOBAL_VALUE	3
++GLOBAL_VALUE	1
+ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	3
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+-VARIABLE_COMMENT	How many additional active worker threads in a group are allowed.
+-NUMERIC_MIN_VALUE	1
+-NUMERIC_MAX_VALUE	1000
+-NUMERIC_BLOCK_SIZE	1
+-ENUM_VALUE_LIST	NULL
+-READ_ONLY	NO
+-COMMAND_LINE_ARGUMENT	REQUIRED
+-VARIABLE_NAME	THREAD_POOL_SIZE
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	4
+-GLOBAL_VALUE_ORIGIN	CONFIG
+-DEFAULT_VALUE	8
++DEFAULT_VALUE	1
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+-VARIABLE_COMMENT	Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing).
++VARIABLE_COMMENT	Minimum number of threads in the thread pool.
+ NUMERIC_MIN_VALUE	1
+-NUMERIC_MAX_VALUE	100000
+-NUMERIC_BLOCK_SIZE	1
+-ENUM_VALUE_LIST	NULL
+-READ_ONLY	NO
+-COMMAND_LINE_ARGUMENT	REQUIRED
+-VARIABLE_NAME	THREAD_POOL_STALL_LIMIT
+-SESSION_VALUE	NULL
+-GLOBAL_VALUE	500
+-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+-DEFAULT_VALUE	500
+-VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+-VARIABLE_COMMENT	Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients.
+-NUMERIC_MIN_VALUE	10
+-NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
++NUMERIC_MAX_VALUE	256
+ NUMERIC_BLOCK_SIZE	1
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+@@ -4638,7 +4624,7 @@
+ DEFAULT_VALUE	
+ VARIABLE_SCOPE	GLOBAL
+ VARIABLE_TYPE	VARCHAR
+-VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a colon (:), in this case they are used in a round-robin fashion
++VARIABLE_COMMENT	Path for temporary files. Several paths may be specified, separated by a semicolon (;), in this case they are used in a round-robin fashion
+ NUMERIC_MIN_VALUE	NULL
+ NUMERIC_MAX_VALUE	NULL
+ NUMERIC_BLOCK_SIZE	NULL
+@@ -4780,7 +4766,7 @@
+ VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+ VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
+ NUMERIC_MIN_VALUE	1
+-NUMERIC_MAX_VALUE	31536000
++NUMERIC_MAX_VALUE	2147483
+ NUMERIC_BLOCK_SIZE	1
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 42ee338..d3ec581 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -14,9 +14,11 @@ variable_name not in (
 'large_files_support', 'log_tc_size',
 'lower_case_file_system',
 'lower_case_table_names',
+'myisam_max_sort_file_size',
 'open_files_limit',
 'rand_seed1',
 'rand_seed2',
+'rowid_merge_buff_size',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -57,7 +59,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Auto-increment columns are incremented by this
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -71,7 +73,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Offset added to Auto-increment columns. Used when auto-increment-increment != 1
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -85,7 +87,7 @@ GLOBAL_VALUE	150
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	150
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65535
@@ -141,10 +143,10 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -169,10 +171,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -183,10 +185,10 @@ GLOBAL_VALUE	100000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -253,10 +255,10 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -267,10 +269,10 @@ GLOBAL_VALUE	8388608
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8388608
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -463,7 +465,7 @@ GLOBAL_VALUE	60
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	31536000
@@ -519,7 +521,7 @@ GLOBAL_VALUE	15
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	15
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Long search depth for the two-step deadlock detection
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	33
@@ -533,7 +535,7 @@ GLOBAL_VALUE	4
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Short search depth for the two-step deadlock detection
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	32
@@ -547,10 +549,10 @@ GLOBAL_VALUE	50000000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50000000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Long timeout for the two-step deadlock detection (in microseconds)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -561,10 +563,10 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Short timeout for the two-step deadlock detection (in microseconds)
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -631,7 +633,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The default week format used by WEEK() functions
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	7
@@ -645,10 +647,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -659,7 +661,7 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How long a INSERT DELAYED thread should wait for INSERT statements before terminating
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -673,10 +675,10 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -701,7 +703,7 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	SQL
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Precision of the result of '/' operator will be increased on that value
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	30
@@ -757,10 +759,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of errors that resulted from the last statement that generated messages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -785,10 +787,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum number of rows a subquery may examine in order to be executed during optimization and used for constant optimization
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -799,7 +801,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	99
@@ -827,7 +829,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of connections on extra-port
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100000
@@ -841,10 +843,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Extra port number to use for tcp connections in a one-thread-per-connection manner. 0 means don't use another port
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -869,7 +871,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	A dedicated thread is created to flush all tables at the given interval
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	31536000
@@ -911,7 +913,7 @@ GLOBAL_VALUE	84
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	84
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	84
@@ -925,7 +927,7 @@ GLOBAL_VALUE	4
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	84
@@ -939,7 +941,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of best matches to use for query expansion
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
@@ -995,10 +997,10 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
 NUMERIC_MIN_VALUE	4
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1051,10 +1053,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Used with global transaction ID to identify logically independent replication streams. When events can propagate through multiple parallel paths (for example multiple masters), each independent source server must use a distinct domain_id. For simple tree-shaped replication topologies, it can be left at its default, 0.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1079,10 +1081,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Internal server usage, for replication with global transaction id. When set, next event group logged to the binary log will use this sequence number, not generate a new one, thus allowing to preserve master's GTID in slave's binlog.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1233,7 +1235,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
@@ -1261,7 +1263,7 @@ GLOBAL_VALUE	128
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many host names should be cached to avoid resolving.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65536
@@ -1275,10 +1277,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synonym for the last_insert_id variable
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1359,10 +1361,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The value to be used by the following INSERT or ALTER TABLE statement when inserting an AUTO_INCREMENT value
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1373,7 +1375,7 @@ GLOBAL_VALUE	28800
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	28800
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the server waits for activity on an interactive connection before closing it
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -1387,7 +1389,7 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Whether there is an active transaction
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1
@@ -1401,10 +1403,10 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer that is used for joins
 NUMERIC_MIN_VALUE	128
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	128
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1415,10 +1417,10 @@ GLOBAL_VALUE	2097152
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2097152
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The limit of the space for all join buffers used by a query
 NUMERIC_MIN_VALUE	2048
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	2048
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1429,7 +1431,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	8
@@ -1457,7 +1459,7 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1471,7 +1473,7 @@ GLOBAL_VALUE	300
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1485,7 +1487,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The default size of key cache blocks
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1499,7 +1501,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum percentage of warm blocks in key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1513,7 +1515,7 @@ GLOBAL_VALUE	512
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	512
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of MyISAM files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open MyISAM files.
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1527,7 +1529,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of segments in a key cache
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
@@ -1555,10 +1557,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If large page support is enabled, this shows the size of memory pages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -1583,10 +1585,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The value to be returned from LAST_INSERT_ID()
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1681,7 +1683,7 @@ GLOBAL_VALUE	31536000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	31536000
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -1821,10 +1823,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1849,10 +1851,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1905,7 +1907,7 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max packet length to send to or receive from the server
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -1915,14 +1917,14 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_BINLOG_CACHE_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709547520
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709547520
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the total size of the transactional cache
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1933,7 +1935,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Binary log will be rotated automatically when the size exceeds this value.
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	1073741824
@@ -1943,14 +1945,14 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_BINLOG_STMT_CACHE_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709547520
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709547520
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED ADJUSTED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the total size of the statement cache
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1961,7 +1963,7 @@ GLOBAL_VALUE	151
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	151
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of simultaneous clients allowed
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100000
@@ -1975,10 +1977,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If there is more than this number of interrupted connections from a host this host will be blocked from further connections
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -1989,7 +1991,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -2003,7 +2005,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum length considered for digest text.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -2017,7 +2019,7 @@ GLOBAL_VALUE	64
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	64
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of errors/warnings to store for a statement
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65535
@@ -2031,10 +2033,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't allow creation of heap tables bigger than this
 NUMERIC_MIN_VALUE	16384
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2045,7 +2047,7 @@ GLOBAL_VALUE	20
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	20
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -2054,15 +2056,15 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	MAX_JOIN_SIZE
-SESSION_VALUE	18446744073709551615
-GLOBAL_VALUE	18446744073709551615
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Joins that are probably going to read more than max_join_size records return an error
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2073,7 +2075,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of bytes in sorted records
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	8388608
@@ -2087,10 +2089,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead.
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -2101,7 +2103,7 @@ GLOBAL_VALUE	16382
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16382
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of prepared statements in the server
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -2115,7 +2117,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	relay log will be rotated automatically when the size exceeds this value.  If 0 at startup, it's set to max_binlog_size
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	1073741824
@@ -2124,15 +2126,15 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_SEEKS_FOR_KEY
-SESSION_VALUE	4294967295
-GLOBAL_VALUE	4294967295
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4294967295
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit assumed max number of seeks when looking up rows based on a key
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2143,7 +2145,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	8388608
@@ -2157,7 +2159,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum stored procedure recursion depth
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
@@ -2185,10 +2187,10 @@ GLOBAL_VALUE	32
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused, will be removed.
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2199,24 +2201,24 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	The maximum number of active connections for a single user (0 = no limit)
 NUMERIC_MIN_VALUE	-1
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_WRITE_LOCK_COUNT
 SESSION_VALUE	NULL
-GLOBAL_VALUE	4294967295
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4294967295
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	After this many write locks, allow some read locks to run in between
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2227,7 +2229,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1048576
@@ -2241,7 +2243,7 @@ GLOBAL_VALUE	8
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1024
@@ -2255,10 +2257,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't write queries to slow log that examine fewer rows than that
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2269,10 +2271,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	262144
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of buffer to use when using MRR with range access
 NUMERIC_MIN_VALUE	8192
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2283,10 +2285,10 @@ GLOBAL_VALUE	256
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	256
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2297,7 +2299,7 @@ GLOBAL_VALUE	1024
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1024
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Block size to be used for MyISAM index pages
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	16384
@@ -2311,7 +2313,7 @@ GLOBAL_VALUE	6
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	6
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Default pointer size to be used for MyISAM tables
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	7
@@ -2319,30 +2321,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
-SESSION_VALUE	NULL
-GLOBAL_VALUE	9223372036853727232
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	9223372036853727232
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
-NUMERIC_BLOCK_SIZE	1048576
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_MMAP_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	18446744073709551615
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
 NUMERIC_MIN_VALUE	7
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -2367,10 +2355,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If larger than 1, when repairing a MyISAM table all indexes will be created in parallel, with one thread per index. The value of 1 disables parallel repair
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2381,10 +2369,10 @@ GLOBAL_VALUE	134216704
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	134216704
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2437,7 +2425,7 @@ GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Buffer length for TCP/IP and socket communication
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1048576
@@ -2451,7 +2439,7 @@ GLOBAL_VALUE	30
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for more data from a connection before aborting the read
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -2465,10 +2453,10 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If a read on a communication port is interrupted, retry this many times before giving up
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2479,7 +2467,7 @@ GLOBAL_VALUE	60
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	60
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for a block to be written to a connection before aborting the write
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -2549,7 +2537,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1
@@ -2563,7 +2551,7 @@ GLOBAL_VALUE	62
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	62
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	63
@@ -2577,10 +2565,10 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls number of record samples to check condition selectivity
 NUMERIC_MIN_VALUE	10
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -2605,7 +2593,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5
@@ -2633,7 +2621,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2647,7 +2635,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Size of the statement digest. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	200
@@ -2661,7 +2649,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2675,7 +2663,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2689,7 +2677,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2703,7 +2691,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2717,7 +2705,7 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2731,7 +2719,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
@@ -2745,7 +2733,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2759,7 +2747,7 @@ GLOBAL_VALUE	80
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	80
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of condition instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2773,7 +2761,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2787,7 +2775,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of file instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2801,7 +2789,7 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of opened instrumented files.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -2815,7 +2803,7 @@ GLOBAL_VALUE	10000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2829,7 +2817,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	200
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of mutex instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2843,7 +2831,7 @@ GLOBAL_VALUE	5000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	104857600
@@ -2857,7 +2845,7 @@ GLOBAL_VALUE	40
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	40
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rwlock instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2871,7 +2859,7 @@ GLOBAL_VALUE	5000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	104857600
@@ -2885,7 +2873,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of socket instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2899,7 +2887,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2913,7 +2901,7 @@ GLOBAL_VALUE	150
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	150
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of stage instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2927,7 +2915,7 @@ GLOBAL_VALUE	178
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	178
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of statement instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2941,7 +2929,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2955,7 +2943,7 @@ GLOBAL_VALUE	500
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2969,7 +2957,7 @@ GLOBAL_VALUE	50
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of thread instruments.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	256
@@ -2983,7 +2971,7 @@ GLOBAL_VALUE	200
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -2997,7 +2985,7 @@ GLOBAL_VALUE	2048
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -3011,7 +2999,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1024
@@ -3025,7 +3013,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	100
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
@@ -3039,7 +3027,7 @@ GLOBAL_VALUE	100
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	-1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT
+VARIABLE_TYPE	<INT or BIGINT>
 VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
 NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
@@ -3095,10 +3083,10 @@ GLOBAL_VALUE	MASTER_MYPORT
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Port number to use for connection or 0 to default to, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306), whatever comes first
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3109,7 +3097,7 @@ GLOBAL_VALUE	32768
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	32768
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -3137,7 +3125,7 @@ GLOBAL_VALUE	15
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	15
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit of query profiling memory
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
@@ -3151,10 +3139,10 @@ GLOBAL_VALUE	5
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	5
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3165,10 +3153,10 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The version of the client/server protocol used by the MySQL server
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3207,10 +3195,10 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	This variable is for internal server use
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3221,10 +3209,10 @@ GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16384
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for query parsing and execution
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3235,10 +3223,10 @@ GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Don't cache results that are bigger than this
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3249,10 +3237,10 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	8
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3263,10 +3251,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The memory allocated to store results from old queries
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3319,10 +3307,10 @@ GLOBAL_VALUE	24576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	24576
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Persistent buffer for query parsing and execution
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3333,10 +3321,10 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
 NUMERIC_MIN_VALUE	4096
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3347,10 +3335,10 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
 NUMERIC_MIN_VALUE	8192
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	4096
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3375,10 +3363,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	262144
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3473,10 +3461,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum space to use for all relay logs
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3627,10 +3615,10 @@ GLOBAL_VALUE	MASTER_MYPORT
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Port for connecting to slave reported to the master during slave registration. Set it only if the slave is listening on a non-default port or if you have a special tunnel from the master or other clients to the slave. If not sure, leave this option unset
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3649,20 +3637,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
-SESSION_VALUE	8388608
-GLOBAL_VALUE	8388608
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	8388608
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	9223372036854775807
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	SECURE_AUTH
 SESSION_VALUE	NULL
 GLOBAL_VALUE	OFF
@@ -3697,10 +3671,10 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3823,7 +3797,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16383
@@ -3865,7 +3839,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	1073741824
@@ -3879,7 +3853,7 @@ GLOBAL_VALUE	120
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	3600
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for more data from any master/slave connection before aborting the read
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -3893,10 +3867,10 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -3921,7 +3895,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16383
@@ -3977,10 +3951,10 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4005,7 +3979,7 @@ GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	31536000
@@ -4061,10 +4035,10 @@ GLOBAL_VALUE	262144
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	2097152
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4196,15 +4170,15 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SQL_SELECT_LIMIT
-SESSION_VALUE	18446744073709551615
-GLOBAL_VALUE	18446744073709551615
+SESSION_VALUE	<32-bit or 64-bit MAX UNSIGNED>
+GLOBAL_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	18446744073709551615
+DEFAULT_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The maximum number of rows to return from SELECT statements
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4215,10 +4189,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Skip the next N events from the master log
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4355,7 +4329,7 @@ GLOBAL_VALUE	256
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	256
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	524288
@@ -4383,10 +4357,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush binary log to disk after every #th event. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4411,10 +4385,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush master info to disk after every #th event. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4425,10 +4399,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush relay log to disk after every #th event. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4439,10 +4413,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Synchronously flush relay log info to disk after every #th transaction. Use 0 (default) to disable synchronous flushing
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4453,7 +4427,7 @@ GLOBAL_VALUE	400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	400
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of cached table definitions
 NUMERIC_MIN_VALUE	400
 NUMERIC_MAX_VALUE	524288
@@ -4467,7 +4441,7 @@ GLOBAL_VALUE	400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	400
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of cached open tables
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	524288
@@ -4481,7 +4455,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many threads we should keep in a cache for reuse
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16384
@@ -4495,7 +4469,7 @@ GLOBAL_VALUE	10
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	10
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	512
@@ -4523,10 +4497,10 @@ GLOBAL_VALUE	60
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	60
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout
 NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4537,7 +4511,7 @@ GLOBAL_VALUE	1000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1000
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum allowed number of worker threads in the thread pool
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	65536
@@ -4551,7 +4525,7 @@ GLOBAL_VALUE	3
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	3
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	How many additional active worker threads in a group are allowed.
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
@@ -4565,7 +4539,7 @@ GLOBAL_VALUE	4
 GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing).
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100000
@@ -4579,10 +4553,10 @@ GLOBAL_VALUE	500
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	500
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients.
 NUMERIC_MIN_VALUE	10
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4593,10 +4567,10 @@ GLOBAL_VALUE	294912
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	294912
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The stack size for each thread
 NUMERIC_MIN_VALUE	131072
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -4624,7 +4598,7 @@ VARIABLE_SCOPE	SESSION ONLY
 VARIABLE_TYPE	DOUBLE
 VARIABLE_COMMENT	Set the time for this client
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	2147483647
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX SIGNED>
 NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4677,10 +4651,10 @@ GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
 NUMERIC_MIN_VALUE	1024
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -4691,7 +4665,7 @@ GLOBAL_VALUE	8192
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	8192
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	134217728
@@ -4705,7 +4679,7 @@ GLOBAL_VALUE	4096
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	4096
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	134217728
@@ -4803,7 +4777,7 @@ GLOBAL_VALUE	28800
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	28800
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	31536000
@@ -4817,14 +4791,15 @@ GLOBAL_VALUE	NULL
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	The number of errors, warnings, and notes that resulted from the last statement that generated messages
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+
 select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
 NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE,
 ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
@@ -4897,7 +4872,7 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LOWER_CASE_TABLE_NAMES
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If set to 1 table names are stored in lowercase on disk and table names will be case-insensitive.  Should be set to 2 if you are using a case insensitive file system
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
@@ -4907,30 +4882,30 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	OPEN_FILES_LIMIT
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	RAND_SEED1
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	RAND_SEED2
 VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -5005,19 +4980,38 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+
 select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
 VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
 from information_schema.system_variables
 where variable_name in (
-'log_tc_size'
+'log_tc_size',
+'myisam_max_sort_file_size',
+'rowid_merge_buff_size'
         )
 order by variable_name;
 VARIABLE_NAME	LOG_TC_SIZE
 GLOBAL_VALUE_ORIGIN	AUTO
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Size of transaction coordinator log.
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
+VARIABLE_COMMENT	The size of the buffers used [NOT] IN evaluation via partial matching
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 set global div_precision_increment=default;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
deleted file mode 100644
index b93afb0..0000000
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
+++ /dev/null
@@ -1,47 +0,0 @@
---- suite/sys_vars/r/sysvars_wsrep.result	2014-10-10 13:33:55.000000000 +0300
-+++ suite/sys_vars/r/sysvars_wsrep,32bit.reject	2014-10-10 19:38:09.000000000 +0300
-@@ -203,7 +203,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	131072
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of rows in write set
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	1048576
-@@ -217,7 +217,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1073741824
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max write set size (bytes)
- NUMERIC_MIN_VALUE	1024
- NUMERIC_MAX_VALUE	4294901759
-@@ -231,7 +231,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	0
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	mysql replication group commit 
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	1000
-@@ -399,7 +399,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	SESSION
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Max number of times to retry a failed autocommit statement
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	10000
-@@ -427,7 +427,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of slave appliers to launch
- NUMERIC_MIN_VALUE	1
- NUMERIC_MAX_VALUE	512
diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
index 54fd0be..fb64e81 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
@@ -189,10 +189,10 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	When wsrep_gtid_mode is set, this value is used as gtid_domain_id for galera transactions and also copied to the joiner nodes during state transfer. It is ignored, otherwise.
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	<32-bit or 64-bit MAX UNSIGNED>
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
@@ -245,7 +245,7 @@ GLOBAL_VALUE	131072
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	131072
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of rows in write set
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1048576
@@ -259,7 +259,7 @@ GLOBAL_VALUE	1073741824
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1073741824
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max write set size (bytes)
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	4294901759
@@ -273,7 +273,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	mysql replication group commit 
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
@@ -455,7 +455,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Max number of times to retry a failed autocommit statement
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10000
@@ -483,7 +483,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Number of slave appliers to launch
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	512
@@ -595,7 +595,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_TYPE	<INT or BIGINT> UNSIGNED
 VARIABLE_COMMENT	Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	7
diff --git a/mysql-test/suite/sys_vars/t/sysvars_aria.test b/mysql-test/suite/sys_vars/t/sysvars_aria.test
index 5ff5c0d..868c05c 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_aria.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_aria.test
@@ -1,7 +1,8 @@
 --source include/have_aria.inc
---source include/word_size.inc
 
 --vertical_results
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+
 select * from information_schema.system_variables
   where variable_name like 'aria%'
   order by variable_name;
diff --git a/mysql-test/suite/sys_vars/t/sysvars_debug.test b/mysql-test/suite/sys_vars/t/sysvars_debug.test
index fbdcbd6..4936455 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_debug.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_debug.test
@@ -1,7 +1,10 @@
 --source include/have_debug.inc
---source include/word_size.inc
+--source include/platform.inc
 
 --vertical_results
+
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+
 select * from information_schema.system_variables
   where variable_name like 'debug%'
   order by variable_name;
diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test
index bd8442b..d4986b2 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_innodb.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_innodb.test
@@ -1,14 +1,28 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_valgrind.inc
---source include/word_size.inc
+--source include/platform.inc
 
 --vertical_results
---replace_regex /^\/\S+/PATH/ /\.\//PATH/
+
+# The version changes every release, so we will mask the value
+--let $innodb_version=`SELECT @@innodb_version`
+
+--replace_regex /^[\/\\]\S+/PATH/ /\.[\/\\]/PATH/ /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+--replace_result $innodb_version '<InnoDB version>'
+
 select * from information_schema.system_variables
   where variable_name like 'innodb%' and
   variable_name not in (
-    'innodb_disallow_writes',           # only available WITH_WSREP
-    'innodb_sched_priority_cleaner',    # linux only
-    'innodb_use_native_aio')            # default value depends on OS
+    'innodb_adaptive_hash_index_partitions',  # max value is 32/64 depending on the word_size, see below
+    'innodb_disallow_writes',                 # only available WITH_WSREP
+    'innodb_use_native_aio')                  # default value depends on OS
   order by variable_name;
+
+--echo 
+
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+--replace_result $MTR_word_size "<value equals the word size>"
+
+select * from information_schema.system_variables
+  where variable_name = 'innodb_adaptive_hash_index_partitions';
diff --git a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test
index 32af7d3..0cf82b6 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test
@@ -1,9 +1,11 @@
 --source include/have_wsrep.inc
---source include/word_size.inc
 --let $datadir = `SELECT @@datadir`
 
---replace_result $datadir DATADIR
 --vertical_results
+
+--replace_regex /^BIGINT\b/<INT or BIGINT>/ /^INT\b/<INT or BIGINT>/ /^(?:18446744073709551615\b|4294967295\b)/<32-bit or 64-bit MAX UNSIGNED>/ /^(?:9223372036854775807\b|2147483647\b)/<32-bit or 64-bit MAX SIGNED>/ /^(?:18446744073709547520\b|4294963200\b)/<32-bit or 64-bit MAX UNSIGNED ADJUSTED>/ /^(?:9223372036853727232\b|2146435072\b)/<32-bit or 64-bit MAX SIGNED ADJUSTED>/
+--replace_result $datadir DATADIR
+
 select * from information_schema.system_variables
   where variable_name like 'wsrep%'
   order by variable_name;
