diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-02-08 01:16:45 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-02-08 01:16:45 +0100 |
| commit | 3c97d24f74b8bfb72746b0a32a78193f20665c44 (patch) | |
| tree | 4dc59c2039b202c2124ec9a7241ecae2a7144c33 /sql/rpl_gtid.cc | |
| parent | 7bb022f3cf1971c90295ed882712ed84079bda20 (diff) | |
| download | mariadb-git-3c97d24f74b8bfb72746b0a32a78193f20665c44.tar.gz | |
MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.
Couple of small fixes following buildbot testing.
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 00140fd3475..2f2254d53af 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -1792,7 +1792,7 @@ gtid_waiting::wait_for_gtid(THD *thd, rpl_gtid *wait_gtid, bool timed_out= false; #ifdef HAVE_REPLICATION queue_element elem; - uint32_t domain_id= wait_gtid->domain_id; + uint32 domain_id= wait_gtid->domain_id; uint64 seq_no= wait_gtid->seq_no; hash_element *he; rpl_slave_state::element *slave_state_elem= NULL; @@ -1958,10 +1958,6 @@ gtid_waiting::wait_for_gtid(THD *thd, rpl_gtid *wait_gtid, thd_wait_end(thd); } - if (elem.wakeup_reason == queue_element::DONE) - break; - takeover= true; - if (thd->killed || timed_out) { remove_from_wait_hash(he, &elem); @@ -1975,6 +1971,10 @@ gtid_waiting::wait_for_gtid(THD *thd, rpl_gtid *wait_gtid, thd->send_kill_message(); break; } + + if (elem.wakeup_reason == queue_element::DONE) + break; + takeover= true; } if (did_enter_cond) |