diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-07-03 19:03:21 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-07-03 19:03:21 +0200 |
| commit | 592e464a021747d7ac5b13222f5de1cd4250531c (patch) | |
| tree | 30b8da717ac2ae51352376b1185afe318ed42ba6 /sql/rpl_gtid.cc | |
| parent | 31a5edb5c27d2ecae8d19345e1a373d22246143a (diff) | |
| download | mariadb-git-592e464a021747d7ac5b13222f5de1cd4250531c.tar.gz | |
MDEV-4506: Parallel replication. Intermediate commit.
Pass down rpl_group_info * to remove one instance of non-threadsafe
use of rli->group_info.
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 54d3b704a2c..bc826e9bdb5 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -62,16 +62,15 @@ rpl_slave_state::update_state_hash(uint64 sub_id, rpl_gtid *gtid) int -rpl_slave_state::record_and_update_gtid(THD *thd, Relay_log_info *rli) +rpl_slave_state::record_and_update_gtid(THD *thd, struct rpl_group_info *rgi) { uint64 sub_id; - struct rpl_group_info *rgi; /* Update the GTID position, if we have it and did not already update it in a GTID transaction. */ - if ((rgi= rli->group_info) && (sub_id= rgi->gtid_sub_id)) + if ((sub_id= rgi->gtid_sub_id)) { rgi->gtid_sub_id= 0; if (record_gtid(thd, &rgi->current_gtid, sub_id, false, false)) |