summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-06-28 15:19:30 +0200
committerunknown <knielsen@knielsen-hq.org>2013-06-28 15:19:30 +0200
commit1b3dc66e3117a09c95a00be2f649b975fdb25e2e (patch)
treedb25dcfc0af5b9cccda27ee022dd8bd7acee0ce2 /sql/rpl_rli.cc
parent7e5dc4f074b7d1cee4721e6fa49d6e5628ef793f (diff)
downloadmariadb-git-1b3dc66e3117a09c95a00be2f649b975fdb25e2e.tar.gz
MDEV-4506: Parallel replication: Intermediate commit.
First step of splitting out part of Relay_log_info, so that different event groups being applied in parallel can each use their own copy.
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 12c38f95575..5d5bca1189c 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -59,7 +59,7 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery)
abort_pos_wait(0), slave_run_id(0), sql_thd(0),
inited(0), abort_slave(0), slave_running(0), until_condition(UNTIL_NONE),
until_log_pos(0), retried_trans(0), executed_entries(0),
- gtid_sub_id(0), tables_to_lock(0), tables_to_lock_count(0),
+ group_info(0), tables_to_lock(0), tables_to_lock_count(0),
last_event_start_time(0), deferred_events(NULL),m_flags(0),
row_stmt_start_timestamp(0), long_find_row_note_printed(false),
m_annotate_event(0)
@@ -113,6 +113,8 @@ Relay_log_info::~Relay_log_info()
mysql_cond_destroy(&sleep_cond);
relay_log.cleanup();
free_annotate_event();
+ if (group_info)
+ my_free(group_info);
DBUG_VOID_RETURN;
}