1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename binlog_dbug_fsync_sleep -> debug_binlog_fsync_sleep

Browse Source
This commit is contained in:
Sergei Golubchik 2011-11-03 13:00:25 +01:00
parent fb43946dad
commit 6c27730adb
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/log.cc
View File

@ -70,7 +70,7 @@ static LEX_STRING const write_error_msg=
static my_bool opt_optimize_thread_scheduling= TRUE; static my_bool opt_optimize_thread_scheduling= TRUE;
ulong binlog_checksum_options; ulong binlog_checksum_options;
#ifndef DBUG_OFF #ifndef DBUG_OFF
static ulong opt_binlog_dbug_fsync_sleep= 0; ulong opt_binlog_dbug_fsync_sleep= 0;
#endif #endif
static my_bool mutexes_inited; static my_bool mutexes_inited;
@ -7067,27 +7067,10 @@ static MYSQL_SYSVAR_ENUM(
BINLOG_CHECKSUM_ALG_OFF, BINLOG_CHECKSUM_ALG_OFF,
&binlog_checksum_typelib); &binlog_checksum_typelib);
#ifndef DBUG_OFF
static MYSQL_SYSVAR_ULONG(
dbug_fsync_sleep,
opt_binlog_dbug_fsync_sleep,
PLUGIN_VAR_RQCMDARG,
"Extra sleep (in microseconds) to add to binlog fsync(), for debugging",
NULL,
NULL,
0,
0,
ULONG_MAX,
0);
#endif
static struct st_mysql_sys_var *binlog_sys_vars[]= static struct st_mysql_sys_var *binlog_sys_vars[]=
{ {
MYSQL_SYSVAR(optimize_thread_scheduling), MYSQL_SYSVAR(optimize_thread_scheduling),
MYSQL_SYSVAR(checksum), MYSQL_SYSVAR(checksum),
#ifndef DBUG_OFF
MYSQL_SYSVAR(dbug_fsync_sleep),
#endif
NULL NULL
}; };

2
sql/mysql_priv.h
View File

@ -2163,7 +2163,7 @@ extern ulong query_buff_size;
extern ulong max_prepared_stmt_count, prepared_stmt_count; extern ulong max_prepared_stmt_count, prepared_stmt_count;
extern ulong binlog_cache_size, open_files_limit; extern ulong binlog_cache_size, open_files_limit;
extern ulonglong max_binlog_cache_size; extern ulonglong max_binlog_cache_size;
extern ulong max_binlog_size, max_relay_log_size; extern ulong max_binlog_size, max_relay_log_size, opt_binlog_dbug_fsync_sleep;
extern ulong opt_binlog_rows_event_max_size; extern ulong opt_binlog_rows_event_max_size;
extern my_bool opt_master_verify_checksum; extern my_bool opt_master_verify_checksum;
extern my_bool opt_slave_sql_verify_checksum; extern my_bool opt_slave_sql_verify_checksum;

8
sql/mysqld.cc
View File

@ -6015,7 +6015,7 @@ enum options_mysqld
OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB, OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB,
OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES, OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES,
OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB, OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB,
OPT_BINLOG_FORMAT, OPT_BINLOG_FORMAT, OPT_DEBUG_BINLOG_FSYNC_SLEEP,
OPT_BINLOG_ANNOTATE_ROWS_EVENTS, OPT_BINLOG_ANNOTATE_ROWS_EVENTS,
OPT_REPLICATE_ANNOTATE_ROWS_EVENTS, OPT_REPLICATE_ANNOTATE_ROWS_EVENTS,
#ifndef DBUG_OFF #ifndef DBUG_OFF
@ -6241,6 +6241,12 @@ struct my_option my_long_options[] =
{"bind-address", OPT_BIND_ADDRESS, "IP address to bind to.", {"bind-address", OPT_BIND_ADDRESS, "IP address to bind to.",
&my_bind_addr_str, &my_bind_addr_str, 0, GET_STR, &my_bind_addr_str, &my_bind_addr_str, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DBUG_OFF
{"debug-binlog-fsync-sleep", OPT_DEBUG_BINLOG_FSYNC_SLEEP,
"Extra sleep (in microseconds) to add to binlog fsync(), for debugging",
&opt_binlog_dbug_fsync_sleep, &opt_binlog_dbug_fsync_sleep,
0, GET_ULONG, REQUIRED_ARG, 0, 0, ULONG_MAX, 0, 1, 0},
#endif
{"binlog_format", OPT_BINLOG_FORMAT, {"binlog_format", OPT_BINLOG_FORMAT,
"Does not have any effect without '--log-bin'. " "Does not have any effect without '--log-bin'. "
"Tell the master the form of binary logging to use: either 'row' for " "Tell the master the form of binary logging to use: either 'row' for "

3
sql/set_var.cc
View File

@ -265,6 +265,9 @@ static sys_var_thd_ulong sys_deadlock_timeout_long(&vars,
&SV::wt_timeout_long); &SV::wt_timeout_long);
#ifndef DBUG_OFF #ifndef DBUG_OFF
static sys_var_thd_dbug sys_dbug(&vars, "debug"); static sys_var_thd_dbug sys_dbug(&vars, "debug");
static sys_var_long_ptr sys_var_debug_binlog_fsync_sleep(&vars,
"debug_binlog_fsync_sleep",
&opt_binlog_dbug_fsync_sleep);
#endif #endif
static sys_var_enum sys_delay_key_write(&vars, "delay_key_write", static sys_var_enum sys_delay_key_write(&vars, "delay_key_write",
&delay_key_write_options, &delay_key_write_options,