diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-09-29 15:27:12 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-09-29 15:27:12 +0100 |
| commit | 0110bd04d24503d84df93d31b444586c4137c98c (patch) | |
| tree | 843223e93a47492e606ba45437990affb3529d89 /sql/sql_repl.cc | |
| parent | 25162d0166206ee4819ece2161d26caa01153723 (diff) | |
| download | mariadb-git-0110bd04d24503d84df93d31b444586c4137c98c.tar.gz | |
BUG#35542 Add option to sync master and relay log to disk after every event
BUG#31665 sync_binlog should cause relay logs to be synchronized
NOTE: Backporting the patch to next-mr.
Add sync_relay_log option to server, this option works for relay log
the same as option sync_binlog for binlog. This option also synchronize
master info to disk when set to non-zero value.
Original patches from Sinisa and Mark, with some modifications
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4d9b7410b88..425d76c8b72 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1753,15 +1753,6 @@ public: */ }; -class sys_var_sync_binlog_period :public sys_var_long_ptr -{ -public: - sys_var_sync_binlog_period(sys_var_chain *chain, const char *name_arg, - ulong *value_ptr) - :sys_var_long_ptr(chain, name_arg,value_ptr) {} - bool update(THD *thd, set_var *var); -}; - static sys_var_chain vars = { NULL, NULL }; static sys_var_const sys_log_slave_updates(&vars, "log_slave_updates", @@ -1793,7 +1784,8 @@ static sys_var_const sys_slave_skip_errors(&vars, "slave_skip_errors", (uchar*) slave_skip_error_names); static sys_var_long_ptr sys_slave_trans_retries(&vars, "slave_transaction_retries", &slave_trans_retries); -static sys_var_sync_binlog_period sys_sync_binlog_period(&vars, "sync_binlog", &sync_binlog_period); +static sys_var_int_ptr sys_sync_binlog_period(&vars, "sync_binlog", &sync_binlog_period); +static sys_var_int_ptr sys_sync_relaylog_period(&vars, "sync_relay_log", &sync_relaylog_period); static sys_var_slave_skip_counter sys_slave_skip_counter(&vars, "sql_slave_skip_counter"); @@ -1835,12 +1827,6 @@ bool sys_var_slave_skip_counter::update(THD *thd, set_var *var) } -bool sys_var_sync_binlog_period::update(THD *thd, set_var *var) -{ - sync_binlog_period= (ulong) var->save_result.ulonglong_value; - return 0; -} - int init_replication_sys_vars() { if (mysql_add_sys_var_chain(vars.first, my_long_options)) |