--- suite/sys_vars/r/sysvars_aria.result	2021-02-02 02:58:55.686921205 +0200
+++ suite/sys_vars/r/sysvars_aria,32bit.reject	2021-02-02 10:55:53.876791633 +0200
@@ -5,7 +5,7 @@
 SESSION_VALUE	NULL
 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	4096
 NUMERIC_MAX_VALUE	32768
@@ -17,7 +17,7 @@
 SESSION_VALUE	NULL
 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
@@ -29,7 +29,7 @@
 SESSION_VALUE	NULL
 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
@@ -53,7 +53,7 @@
 SESSION_VALUE	NULL
 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
@@ -77,7 +77,7 @@
 SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Interval between commits in microseconds (1/1000000 sec). 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
@@ -89,7 +89,7 @@
 SESSION_VALUE	NULL
 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
@@ -125,10 +125,10 @@
 SESSION_VALUE	NULL
 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
@@ -149,7 +149,7 @@
 SESSION_VALUE	NULL
 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
@@ -161,7 +161,7 @@
 SESSION_VALUE	NULL
 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
@@ -197,7 +197,7 @@
 SESSION_VALUE	1
 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
@@ -212,7 +212,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	9223372036854775807
+NUMERIC_MAX_VALUE	2147483647
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO