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 /client | |
| 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 'client')
| -rw-r--r-- | client/mysql.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index f7975bf874a..faac5676cf7 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -915,6 +915,7 @@ static COMMANDS commands[] = { { "MAKE_SET", 0, 0, 0, ""}, { "MAKEDATE", 0, 0, 0, ""}, { "MAKETIME", 0, 0, 0, ""}, + { "MASTER_GTID_WAIT", 0, 0, 0, ""}, { "MASTER_POS_WAIT", 0, 0, 0, ""}, { "MAX", 0, 0, 0, ""}, { "MBRCONTAINS", 0, 0, 0, ""}, |