diff options
author | unknown <knielsen@knielsen-hq.org> | 2014-02-10 12:39:26 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2014-02-10 12:39:26 +0100 |
commit | fefdb576bb6b49adcff914f909429781452dd7bf (patch) | |
tree | 9a9e5f5f6e796e4e621eb593ed7992be57aa3683 /sql/sql_union.cc | |
parent | 8cc6e90d74f4377491bcb7a0f1acd41ccf9fbcae (diff) | |
parent | 4a976545e518e70d5124e356a057c8d9624038a3 (diff) | |
download | mariadb-git-fefdb576bb6b49adcff914f909429781452dd7bf.tar.gz |
Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.
MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.
MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
MDEV-5636: Deadlock in RESET MASTER
Diffstat (limited to 'sql/sql_union.cc')
0 files changed, 0 insertions, 0 deletions