summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-05-06 14:35:34 +0200
committerunknown <knielsen@knielsen-hq.org>2013-05-06 14:35:34 +0200
commite5a0daae5a95b3fa116d71f65dfaf85cbbb1ca7d (patch)
tree77c2caa0e7ade70869ad90a684038a0a34fb28fe
parent5333dafa843477b5499a5e77a5bf942bc1ed7a18 (diff)
downloadmariadb-git-e5a0daae5a95b3fa116d71f65dfaf85cbbb1ca7d.tar.gz
Fix big problem in previous push. (Relay log cleanup would nuke binlog state)
-rw-r--r--sql/log.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index a96ec830b01..c0cd4be8a45 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2999,7 +2999,8 @@ void MYSQL_BIN_LOG::cleanup()
We can't do that automaticly as we need to do this before
safemalloc is shut down
*/
- rpl_global_gtid_binlog_state.free();
+ if (!is_relay_log)
+ rpl_global_gtid_binlog_state.free();
DBUG_VOID_RETURN;
}