database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Marko Mäkelä
2017-01-07 15:27:59 +02:00
parent 8049d2e9d9
commit 384f4d1e36
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@@ -585,7 +585,7 @@ GLOBAL_VALUE 0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295

2
storage/innobase/handler/ha_innodb.cc
View File

@@ -19691,7 +19691,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
"but the each purges were not done yet.",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(data_file_size_debug,
static MYSQL_SYSVAR_UINT(data_file_size_debug,
srv_sys_space_size_debug,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"InnoDB system tablespace size to be set in recovery.",

2
storage/innobase/include/srv0srv.h
View File

@@ -525,7 +525,7 @@ extern my_bool srv_ibuf_disable_background_merge;
#ifdef UNIV_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 */
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200

2
storage/innobase/srv/srv0start.cc
View File

@@ -129,7 +129,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
static ibool srv_start_has_been_called = FALSE;
#ifdef UNIV_DEBUG
/** 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 */
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to

2
storage/xtradb/handler/ha_innodb.cc
View File

@@ -21172,7 +21172,7 @@ static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
"but the each purges were not done yet.",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(data_file_size_debug,
static MYSQL_SYSVAR_UINT(data_file_size_debug,
srv_sys_space_size_debug,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"InnoDB system tablespace size to be set in recovery.",

2
storage/xtradb/include/srv0srv.h
View File

@@ -626,7 +626,7 @@ extern my_bool srv_ibuf_disable_background_merge;
#ifdef UNIV_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 */
#define SRV_SEMAPHORE_WAIT_EXTENSION 7200

2
storage/xtradb/srv/srv0start.cc
View File

@@ -132,7 +132,7 @@ UNIV_INTERN ibool srv_was_started = FALSE;
static ibool srv_start_has_been_called = FALSE;
#ifdef UNIV_DEBUG
/** 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 */
/** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to