Merge 10.1 into 10.2

Author: dr-m

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

@@ -642,7 +642,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

storage/innobase/handler/ha_innodb.cc

@@ -22945,7 +22945,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.",

storage/innobase/include/srv0srv.h

@@ -538,7 +538,7 @@ extern my_bool	srv_purge_view_update_only_debug;
 
 /** Value of MySQL global used to disable master thread. */
 extern my_bool	srv_master_thread_disabled_debug;
-extern ulong	srv_sys_space_size_debug;
+extern uint	srv_sys_space_size_debug;
 #endif /* UNIV_DEBUG */
 
 #define SRV_SEMAPHORE_WAIT_EXTENSION	7200

storage/innobase/srv/srv0start.cc

@@ -139,7 +139,7 @@ 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 */
 
 /** Bit flags for tracking background thread creation. They are used to

storage/xtradb/handler/ha_innodb.cc

@@ -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.",

storage/xtradb/include/srv0srv.h

@@ -623,7 +623,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

storage/xtradb/srv/srv0start.cc

@@ -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