diff options
author | unknown <guilhem@mysql.com> | 2004-03-10 16:56:28 +0100 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-03-10 16:56:28 +0100 |
commit | c6d91e00bbd103e46d806b1b9aad1963f4cfe18c (patch) | |
tree | 46e90eed3c4eb4203616844eb60c039281f944ec /sql/repl_failsafe.cc | |
parent | 843d6df523a255e9ecb864d0ed26761e353f4639 (diff) | |
download | mariadb-git-c6d91e00bbd103e46d806b1b9aad1963f4cfe18c.tar.gz |
Backporting parts of
ChangeSet 1.1620.12.1 and ChangeSet 1.1625.2.1
from 4.1. This makes the slave I/O thread flush the relay log
after every event, which provides additional safety in case
of brutal crash (reduces chances to lose a part of the relay log).
sql/repl_failsafe.cc:
update for new prototype
sql/slave.cc:
The slave I/O thread now flushes the relay log after writing
every event to it, like we already do in 4.1.
sql/slave.h:
new prototype
sql/sql_repl.cc:
update for new prototype
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 6599516044a..56789a01bf4 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -894,7 +894,7 @@ int load_master_data(THD* thd) if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE) active_mi->master_log_pos = BIN_LOG_HEADER_SIZE; active_mi->rli.pending = 0; - flush_master_info(active_mi); + flush_master_info(active_mi, 0); } mc_mysql_free_result(master_status_res); } |