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/share | |
| 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/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 0c9c84d4964..1ed2a2ba462 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6524,7 +6524,7 @@ ER_UNTIL_REQUIRES_USING_GTID ER_GTID_STRICT_OUT_OF_ORDER eng "An attempt was made to binlog GTID %u-%u-%llu which would create an out-of-order sequence number with existing GTID %u-%u-%llu, and gtid strict mode is enabled." ER_GTID_START_FROM_BINLOG_HOLE - eng "The binlog on the master is missing the GTID %u-%u-%llu requested by the slave (even though both a prior and a subsequent sequence number does exist), and GTID strict mode is enabled" + eng "The binlog on the master is missing the GTID %u-%u-%llu requested by the slave (even though a subsequent sequence number does exist), and GTID strict mode is enabled" ER_SLAVE_UNEXPECTED_MASTER_SWITCH eng "Unexpected GTID received from master after reconnect. This normally indicates that the master server was replaced without restarting the slave threads. %s" ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO |