Commit 384f4d1e authored by Marko Mäkelä's avatar Marko Mäkelä

Post-push fix for MDEV-11556: Make the debug variable UINT.

Sometimes innodb_data_file_size_debug was reported as INT UNSIGNED
instead of BIGINT UNSIGNED. Make it uint instead of ulong to get
a more deterministic result.
parent 8049d2e9
...@@ -585,7 +585,7 @@ GLOBAL_VALUE 0 ...@@ -585,7 +585,7 @@ GLOBAL_VALUE 0
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery. VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
......
...@@ -19691,7 +19691,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug, ...@@ -19691,7 +19691,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
"but the each purges were not done yet.", "but the each purges were not done yet.",
NULL, NULL, FALSE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(data_file_size_debug, static MYSQL_SYSVAR_UINT(data_file_size_debug,
srv_sys_space_size_debug, srv_sys_space_size_debug,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"InnoDB system tablespace size to be set in recovery.", "InnoDB system tablespace size to be set in recovery.",
......
...@@ -525,7 +525,7 @@ extern my_bool srv_ibuf_disable_background_merge; ...@@ -525,7 +525,7 @@ extern my_bool srv_ibuf_disable_background_merge;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
extern my_bool srv_purge_view_update_only_debug; extern my_bool srv_purge_view_update_only_debug;
extern ulong srv_sys_space_size_debug; extern uint srv_sys_space_size_debug;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200 #define SRV_SEMAPHORE_WAIT_EXTENSION 7200
......
...@@ -129,7 +129,7 @@ UNIV_INTERN ibool srv_was_started = FALSE; ...@@ -129,7 +129,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
static ibool srv_start_has_been_called = FALSE; static ibool srv_start_has_been_called = FALSE;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/** InnoDB system tablespace to set during recovery */ /** InnoDB system tablespace to set during recovery */
UNIV_INTERN ulong srv_sys_space_size_debug; UNIV_INTERN uint srv_sys_space_size_debug;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to /** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to
......
...@@ -21172,7 +21172,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug, ...@@ -21172,7 +21172,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
"but the each purges were not done yet.", "but the each purges were not done yet.",
NULL, NULL, FALSE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(data_file_size_debug, static MYSQL_SYSVAR_UINT(data_file_size_debug,
srv_sys_space_size_debug, srv_sys_space_size_debug,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"InnoDB system tablespace size to be set in recovery.", "InnoDB system tablespace size to be set in recovery.",
......
...@@ -626,7 +626,7 @@ extern my_bool srv_ibuf_disable_background_merge; ...@@ -626,7 +626,7 @@ extern my_bool srv_ibuf_disable_background_merge;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
extern my_bool srv_purge_view_update_only_debug; extern my_bool srv_purge_view_update_only_debug;
extern ulong srv_sys_space_size_debug; extern uint srv_sys_space_size_debug;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200 #define SRV_SEMAPHORE_WAIT_EXTENSION 7200
......
...@@ -132,7 +132,7 @@ UNIV_INTERN ibool srv_was_started = FALSE; ...@@ -132,7 +132,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
static ibool srv_start_has_been_called = FALSE; static ibool srv_start_has_been_called = FALSE;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/** InnoDB system tablespace to set during recovery */ /** InnoDB system tablespace to set during recovery */
UNIV_INTERN ulong srv_sys_space_size_debug; UNIV_INTERN uint srv_sys_space_size_debug;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to /** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment