Skip to content

Commit 384f4d1

Browse files
committed
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.
1 parent 8049d2e commit 384f4d1

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

mysql-test/suite/sys_vars/r/sysvars_innodb.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ GLOBAL_VALUE 0
585585
GLOBAL_VALUE_ORIGIN COMPILE-TIME
586586
DEFAULT_VALUE 0
587587
VARIABLE_SCOPE GLOBAL
588-
VARIABLE_TYPE BIGINT UNSIGNED
588+
VARIABLE_TYPE INT UNSIGNED
589589
VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery.
590590
NUMERIC_MIN_VALUE 0
591591
NUMERIC_MAX_VALUE 4294967295

storage/innobase/handler/ha_innodb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19691,7 +19691,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
1969119691
"but the each purges were not done yet.",
1969219692
NULL, NULL, FALSE);
1969319693

19694-
static MYSQL_SYSVAR_ULONG(data_file_size_debug,
19694+
static MYSQL_SYSVAR_UINT(data_file_size_debug,
1969519695
srv_sys_space_size_debug,
1969619696
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
1969719697
"InnoDB system tablespace size to be set in recovery.",

storage/innobase/include/srv0srv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ extern my_bool srv_ibuf_disable_background_merge;
525525

526526
#ifdef UNIV_DEBUG
527527
extern my_bool srv_purge_view_update_only_debug;
528-
extern ulong srv_sys_space_size_debug;
528+
extern uint srv_sys_space_size_debug;
529529
#endif /* UNIV_DEBUG */
530530

531531
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200

storage/innobase/srv/srv0start.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
129129
static ibool srv_start_has_been_called = FALSE;
130130
#ifdef UNIV_DEBUG
131131
/** InnoDB system tablespace to set during recovery */
132-
UNIV_INTERN ulong srv_sys_space_size_debug;
132+
UNIV_INTERN uint srv_sys_space_size_debug;
133133
#endif /* UNIV_DEBUG */
134134

135135
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to

storage/xtradb/handler/ha_innodb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21172,7 +21172,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
2117221172
"but the each purges were not done yet.",
2117321173
NULL, NULL, FALSE);
2117421174

21175-
static MYSQL_SYSVAR_ULONG(data_file_size_debug,
21175+
static MYSQL_SYSVAR_UINT(data_file_size_debug,
2117621176
srv_sys_space_size_debug,
2117721177
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2117821178
"InnoDB system tablespace size to be set in recovery.",

storage/xtradb/include/srv0srv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ extern my_bool srv_ibuf_disable_background_merge;
626626

627627
#ifdef UNIV_DEBUG
628628
extern my_bool srv_purge_view_update_only_debug;
629-
extern ulong srv_sys_space_size_debug;
629+
extern uint srv_sys_space_size_debug;
630630
#endif /* UNIV_DEBUG */
631631

632632
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200

storage/xtradb/srv/srv0start.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
132132
static ibool srv_start_has_been_called = FALSE;
133133
#ifdef UNIV_DEBUG
134134
/** InnoDB system tablespace to set during recovery */
135-
UNIV_INTERN ulong srv_sys_space_size_debug;
135+
UNIV_INTERN uint srv_sys_space_size_debug;
136136
#endif /* UNIV_DEBUG */
137137

138138
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to

0 commit comments

Comments
 (0)