summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-11-29 15:46:09 +0100
committerunknown <knielsen@knielsen-hq.org>2013-11-29 15:46:09 +0100
commit4bce09c104f5c9ddc3600a77c9db44dfa7fd283c (patch)
tree856be59d3719e93c820d2fbc45e591f7132e4af7 /sql/slave.cc
parentc23b36510e03fbb20afa18d6b9d9a353f01a1b30 (diff)
downloadmariadb-git-4bce09c104f5c9ddc3600a77c9db44dfa7fd283c.tar.gz
MDEV-4986: GTID - do not do on-disk update of master.info after every event group
This was actually implemented as part of MDEV-4506, parallel replication. Unfortunately, one of the conditionals was reversed. So fsync of master.info was disabled in non-gtid mode, instead of in gtid mode. So fix the conditional to be correct.
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 4c9cd01888e..4be4a96d142 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3974,7 +3974,7 @@ Stopping slave I/O thread due to out-of-memory error from master");
goto err;
}
- if (mi->using_gtid != Master_info::USE_GTID_NO &&
+ if (mi->using_gtid == Master_info::USE_GTID_NO &&
flush_master_info(mi, TRUE, TRUE))
{
sql_print_error("Failed to flush master info file");