Commit bdfa49f6 authored by Marko Mäkelä's avatar Marko Mäkelä

Remove redundant initialization of some InnoDB startup parameters

The InnoDB startup parameters will be initialized via pointers
in innobase_system_variables[]. Remove some redundant link-time
initialization.
parent 206ecb79
...@@ -215,46 +215,46 @@ static uint innobase_old_blocks_pct; ...@@ -215,46 +215,46 @@ static uint innobase_old_blocks_pct;
/* The default values for the following char* start-up parameters /* The default values for the following char* start-up parameters
are determined in innobase_init below: */ are determined in innobase_init below: */
static char* innobase_data_home_dir = NULL; static char* innobase_data_home_dir;
static char* innobase_data_file_path = NULL; static char* innobase_data_file_path;
static char* innobase_temp_data_file_path = NULL; static char* innobase_temp_data_file_path;
static char* innobase_file_format_name = NULL; static char* innobase_file_format_name;
static char* innobase_change_buffering = NULL; static char* innobase_change_buffering;
static char* innobase_enable_monitor_counter = NULL; static char* innobase_enable_monitor_counter;
static char* innobase_disable_monitor_counter = NULL; static char* innobase_disable_monitor_counter;
static char* innobase_reset_monitor_counter = NULL; static char* innobase_reset_monitor_counter;
static char* innobase_reset_all_monitor_counter = NULL; static char* innobase_reset_all_monitor_counter;
/* The highest file format being used in the database. The value can be /* The highest file format being used in the database. The value can be
set by user, however, it will be adjusted to the newer file format if set by user, however, it will be adjusted to the newer file format if
a table of such format is created/opened. */ a table of such format is created/opened. */
char* innobase_file_format_max = NULL; char* innobase_file_format_max;
/** Default value of innodb_file_format */ /** Default value of innodb_file_format */
static const char* innodb_file_format_default = "Barracuda"; static const char* innodb_file_format_default = "Barracuda";
/** Default value of innodb_file_format_max */ /** Default value of innodb_file_format_max */
static const char* innodb_file_format_max_default = "Antelope"; static const char* innodb_file_format_max_default = "Antelope";
static char* innobase_file_flush_method = NULL; static char* innobase_file_flush_method;
/* This variable can be set in the server configure file, specifying /* This variable can be set in the server configure file, specifying
stopword table to be used */ stopword table to be used */
static char* innobase_server_stopword_table = NULL; static char* innobase_server_stopword_table;
/* Below we have boolean-valued start-up parameters, and their default /* Below we have boolean-valued start-up parameters, and their default
values */ values */
static my_bool innobase_file_format_check = TRUE; static my_bool innobase_file_format_check;
static my_bool innobase_use_atomic_writes = TRUE; static my_bool innobase_use_atomic_writes;
static my_bool innobase_use_fallocate; static my_bool innobase_use_fallocate;
static my_bool innobase_use_doublewrite = TRUE; static my_bool innobase_use_doublewrite;
static my_bool innobase_use_checksums = TRUE; static my_bool innobase_use_checksums;
static my_bool innobase_locks_unsafe_for_binlog = FALSE; static my_bool innobase_locks_unsafe_for_binlog;
static my_bool innobase_rollback_on_timeout = FALSE; static my_bool innobase_rollback_on_timeout;
static my_bool innobase_create_status_file = FALSE; static my_bool innobase_create_status_file;
my_bool innobase_stats_on_metadata = TRUE; my_bool innobase_stats_on_metadata;
static my_bool innobase_large_prefix = FALSE; static my_bool innobase_large_prefix;
static my_bool innodb_optimize_fulltext_only = FALSE; static my_bool innodb_optimize_fulltext_only;
static char* innodb_version_str = (char*) INNODB_VERSION_STR; static char* innodb_version_str = (char*) INNODB_VERSION_STR;
......
...@@ -107,34 +107,34 @@ const char srv_mysql50_table_name_prefix[10] = "#mysql50#"; ...@@ -107,34 +107,34 @@ const char srv_mysql50_table_name_prefix[10] = "#mysql50#";
/* The following three are dir paths which are catenated before file /* The following three are dir paths which are catenated before file
names, where the file name itself may also contain a path */ names, where the file name itself may also contain a path */
char* srv_data_home = NULL; char* srv_data_home;
/** Rollback files directory, can be absolute. */ /** Rollback files directory, can be absolute. */
char* srv_undo_dir = NULL; char* srv_undo_dir;
/** The number of tablespaces to use for rollback segments. */ /** The number of tablespaces to use for rollback segments. */
ulong srv_undo_tablespaces = 0; ulong srv_undo_tablespaces;
/** The number of UNDO tablespaces that are open and ready to use. */ /** The number of UNDO tablespaces that are open and ready to use. */
ulint srv_undo_tablespaces_open = 0; ulint srv_undo_tablespaces_open;
/** The number of UNDO tablespaces that are active (hosting some rollback /** The number of UNDO tablespaces that are active (hosting some rollback
segment). It is quite possible that some of the tablespaces doesn't host segment). It is quite possible that some of the tablespaces doesn't host
any of the rollback-segment based on configuration used. */ any of the rollback-segment based on configuration used. */
ulint srv_undo_tablespaces_active = 0; ulint srv_undo_tablespaces_active;
/* The number of rollback segments to use */ /* The number of rollback segments to use */
ulong srv_undo_logs = 1; ulong srv_undo_logs;
/** Rate at which UNDO records should be purged. */ /** Rate at which UNDO records should be purged. */
ulong srv_purge_rseg_truncate_frequency = 128; ulong srv_purge_rseg_truncate_frequency;
/** Enable or Disable Truncate of UNDO tablespace. /** Enable or Disable Truncate of UNDO tablespace.
Note: If enabled then UNDO tablespace will be selected for truncate. Note: If enabled then UNDO tablespace will be selected for truncate.
While Server waits for undo-tablespace to truncate if user disables While Server waits for undo-tablespace to truncate if user disables
it, truncate action is completed but no new tablespace is marked it, truncate action is completed but no new tablespace is marked
for truncate (action is never aborted). */ for truncate (action is never aborted). */
my_bool srv_undo_log_truncate = FALSE; my_bool srv_undo_log_truncate;
/** Maximum size of undo tablespace. */ /** Maximum size of undo tablespace. */
unsigned long long srv_max_undo_log_size; unsigned long long srv_max_undo_log_size;
...@@ -166,9 +166,9 @@ my_bool high_level_read_only; ...@@ -166,9 +166,9 @@ my_bool high_level_read_only;
/** Place locks to records only i.e. do not use next-key locking except /** Place locks to records only i.e. do not use next-key locking except
on duplicate key checking and foreign key checking */ on duplicate key checking and foreign key checking */
ibool srv_locks_unsafe_for_binlog = FALSE; ibool srv_locks_unsafe_for_binlog;
/** Sort buffer size in index creation */ /** Sort buffer size in index creation */
ulong srv_sort_buf_size = 1048576; ulong srv_sort_buf_size;
/** Maximum modification log file size for online index creation */ /** Maximum modification log file size for online index creation */
unsigned long long srv_online_max_size; unsigned long long srv_online_max_size;
...@@ -176,13 +176,13 @@ unsigned long long srv_online_max_size; ...@@ -176,13 +176,13 @@ unsigned long long srv_online_max_size;
OS (provided we compiled Innobase with it in), otherwise we will OS (provided we compiled Innobase with it in), otherwise we will
use simulated aio we build below with threads. use simulated aio we build below with threads.
Currently we support native aio on windows and linux */ Currently we support native aio on windows and linux */
my_bool srv_use_native_aio = TRUE; my_bool srv_use_native_aio;
my_bool srv_numa_interleave = FALSE; my_bool srv_numa_interleave;
/* If this flag is TRUE, then we will use fallocate(PUCH_HOLE) /* If this flag is TRUE, then we will use fallocate(PUCH_HOLE)
to the pages */ to the pages */
UNIV_INTERN my_bool srv_use_trim; UNIV_INTERN my_bool srv_use_trim;
/* If this flag is TRUE, then we disable doublewrite buffer */ /* If this flag is TRUE, then we disable doublewrite buffer */
UNIV_INTERN my_bool srv_use_atomic_writes = FALSE; UNIV_INTERN my_bool srv_use_atomic_writes;
/* If this flag IS TRUE, then we use this algorithm for page compressing the pages */ /* If this flag IS TRUE, then we use this algorithm for page compressing the pages */
UNIV_INTERN ulong innodb_compression_algorithm = PAGE_ZLIB_ALGORITHM; UNIV_INTERN ulong innodb_compression_algorithm = PAGE_ZLIB_ALGORITHM;
/* Number of threads used for multi-threaded flush */ /* Number of threads used for multi-threaded flush */
......
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