After-merge fix: sys_vars.sysvars_innodb,32bit

1 files changed, 550 insertions, 272 deletions

diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
index 16cda279c3e..50a1d1f197a 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
@@ -1,272 +1,550 @@
-52c52
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-64c64
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-76c76
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-88c88
-< VARIABLE_TYPE	BIGINT
----
-> VARIABLE_TYPE	INT
-160c160
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-163c163
-< NUMERIC_MAX_VALUE	9223372036854775807
----
-> NUMERIC_MAX_VALUE	2147483647
-196c196
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-232c232
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-292c292
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-388c388
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-424c424
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-448c448
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-460c460
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-463c463
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-688c688
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-784c784
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-832c832
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-844c844
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-868c868
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-892c892
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-940c940
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-964c964
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1000c1000
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1012c1012
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1024c1024
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1036c1036
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1039c1039
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1060c1060
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1072c1072
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1096c1096
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1120c1120
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1123c1123
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1130c1130
-< DEFAULT_VALUE	18446744073709551615
----
-> DEFAULT_VALUE	4294967295
-1132c1132
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1135c1135
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1192c1192
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1204c1204
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1207c1207
-< NUMERIC_MAX_VALUE	9223372036854775807
----
-> NUMERIC_MAX_VALUE	2147483647
-1252c1252
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1300c1300
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1312c1312
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1315c1315
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1360c1360
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1363c1363
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1372c1372
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1492c1492
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1495c1495
-< NUMERIC_MAX_VALUE	9223372036854775807
----
-> NUMERIC_MAX_VALUE	2147483647
-1516c1516
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1540c1540
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1552c1552
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1588c1588
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1600c1600
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1612c1612
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1636c1636
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1648c1648
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1672c1672
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1675c1675
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1696c1696
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1708c1708
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1756c1756
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1936c1936
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1960c1960
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-1963c1963
-< NUMERIC_MAX_VALUE	18446744073709551615
----
-> NUMERIC_MAX_VALUE	4294967295
-1996c1996
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-2008c2008
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-2068c2068
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-2092c2092
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
-2116c2116
-< VARIABLE_TYPE	BIGINT UNSIGNED
----
-> VARIABLE_TYPE	INT UNSIGNED
+@@ -49,7 +49,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	8
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Number of InnoDB Adaptive Hash Index Partitions (default 8)
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	512
+@@ -61,7 +61,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -73,7 +73,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -85,7 +85,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -157,10 +157,10 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	134217728
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Size of a single memory chunk within each buffer pool instance for resizing buffer pool. Online buffer pool resizing happens at this granularity. 0 means disable resizing buffer pool.
+ NUMERIC_MIN_VALUE	1048576
+-NUMERIC_MAX_VALUE	9223372036854775807
++NUMERIC_MAX_VALUE	2147483647
+ NUMERIC_BLOCK_SIZE	1048576
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES
+@@ -193,7 +193,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	25
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Dump only the hottest N% of each buffer pool, defaults to 25
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	100
+@@ -229,7 +229,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	0
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ 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
+@@ -289,7 +289,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -397,7 +397,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -433,7 +433,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -457,7 +457,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -469,10 +469,10 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -697,7 +697,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -793,7 +793,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -841,7 +841,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -853,7 +853,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -877,7 +877,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -901,7 +901,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -949,7 +949,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -973,7 +973,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1009,7 +1009,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1021,7 +1021,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1033,7 +1033,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1045,10 +1045,10 @@
+ SESSION_VALUE	NULL
+ 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	18446744073709551615
++NUMERIC_MAX_VALUE	4294967295
+ NUMERIC_BLOCK_SIZE	0
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+@@ -1069,7 +1069,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1081,7 +1081,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1105,7 +1105,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1141,22 +1141,22 @@
+ SESSION_VALUE	NULL
+ 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
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	INNODB_IO_CAPACITY_MAX
+ SESSION_VALUE	NULL
+-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
+@@ -1213,7 +1213,7 @@
+ SESSION_VALUE	50
+ 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	0
+ NUMERIC_MAX_VALUE	1073741824
+@@ -1225,10 +1225,10 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	16777216
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ 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
+@@ -1273,7 +1273,7 @@
+ SESSION_VALUE	NULL
+ 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	1
+ NUMERIC_MAX_VALUE	100
+@@ -1321,7 +1321,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	8192
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Redo log write ahead unit size to avoid read-on-write, it should match the OS cache block IO size
+ NUMERIC_MIN_VALUE	512
+ NUMERIC_MAX_VALUE	16384
+@@ -1333,10 +1333,10 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1381,10 +1381,10 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1393,7 +1393,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1525,10 +1525,10 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	0
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ 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
+@@ -1549,7 +1549,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	4
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Page cleaner threads can be from 1 to 64. Default is 4.
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	64
+@@ -1573,7 +1573,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1585,7 +1585,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1621,7 +1621,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1633,7 +1633,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	128
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Dictates rate at which UNDO records are purged. Value N means purge rollback segment(s) on every Nth iteration of purge invocation
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	128
+@@ -1645,7 +1645,7 @@
+ SESSION_VALUE	NULL
+ DEFAULT_VALUE	4
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Purge threads can be from 1 to 32. Default is 4.
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	32
+@@ -1669,7 +1669,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1681,7 +1681,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1705,10 +1705,10 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1729,7 +1729,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1741,7 +1741,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1789,7 +1789,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1969,7 +1969,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -1993,10 +1993,10 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -2029,7 +2029,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -2041,7 +2041,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -2101,7 +2101,7 @@
+ SESSION_VALUE	NULL
+ 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
+@@ -2125,7 +2125,7 @@
+ SESSION_VALUE	NULL
+ 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	127
+@@ -2149,7 +2149,7 @@
+ SESSION_VALUE	NULL
+ 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