summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-03-10 16:30:47 +0100
committerunknown <guilhem@mysql.com>2004-03-10 16:30:47 +0100
commit843d6df523a255e9ecb864d0ed26761e353f4639 (patch)
treedb053b8bdf0f145409d1e621ed5a98cdff683a9f /sql/sql_repl.cc
parentb2147e25639c20494820f5ca409e6efb8dd7e497 (diff)
downloadmariadb-git-843d6df523a255e9ecb864d0ed26761e353f4639.tar.gz
Undoing 2 parts of changeset 1.1730.1.1 :
- the one about BUG#2921 - the one about relay log flushing Both will be rewritten in a next changeset (this one will not be pushed before the next changeset). sql/log.cc: undo sql/log_event.cc: undo sql/repl_failsafe.cc: undo sql/slave.cc: undo sql/slave.h: undo sql/sql_repl.cc: undo
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 85dcd3b5236..7c56670935b 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1015,10 +1015,10 @@ int change_master(THD* thd, MASTER_INFO* mi)
If we don't write new coordinates to disk now, then old will remain in
relay-log.info until START SLAVE is issued; but if mysqld is shutdown
before START SLAVE, then old will remain in relay-log.info, and will be the
- in-memory value at restart (thus causing errors, as the old relay log
- does not exist anymore).
+ in-memory value at restart (thus causing errors, as the old relay log does
+ not exist anymore).
*/
- flush_relay_log_info(&mi->rli, 0);
+ flush_relay_log_info(&mi->rli);
pthread_cond_broadcast(&mi->data_cond);
pthread_mutex_unlock(&mi->rli.data_lock);