diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:42:48 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:42:48 +0200 |
commit | 47f8e0ef6eb171119b092861ce1196bdedbd834c (patch) | |
tree | cc7e49575d6164b742c2c5394ae2b0ac96b055f6 /sql/rpl_rli.h | |
parent | ba4b937af2e3c9118071b1279bc39b6febca73a9 (diff) | |
download | mariadb-git-47f8e0ef6eb171119b092861ce1196bdedbd834c.tar.gz |
MDEV-4506: Parallel replication: Intermediate commit
Remove Relay_log_info::group_info. (It is not thread safe).
Diffstat (limited to 'sql/rpl_rli.h')
-rw-r--r-- | sql/rpl_rli.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 07ce0600d94..a78741df3e0 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -314,8 +314,6 @@ public: char slave_patternload_file[FN_REFLEN]; size_t slave_patternload_file_size; - /* ToDo: We need to remove this, always use the per-transaction one to work with parallel replication. */ - struct rpl_group_info *group_info; rpl_parallel parallel; Relay_log_info(bool is_slave_recovery); @@ -657,7 +655,7 @@ extern struct rpl_slave_state rpl_global_gtid_slave_state; int rpl_load_gtid_slave_state(THD *thd); int event_group_new_gtid(rpl_group_info *rgi, Gtid_log_event *gev); -void delete_or_keep_event_post_apply(Relay_log_info *rli, +void delete_or_keep_event_post_apply(rpl_group_info *rgi, Log_event_type typ, Log_event *ev); #endif /* RPL_RLI_H */ |