diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
| commit | db0cfba638383569b1e30765e2d36e0707bfb930 (patch) | |
| tree | d56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/share/errmsg-utf8.txt | |
| parent | 0a9216835f406947fb4d492616da4cda75e5e113 (diff) | |
| parent | a057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff) | |
| download | mariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz | |
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index ad055273155..5c60de14742 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6760,7 +6760,7 @@ ER_GTID_OPEN_TABLE_FAILED ER_GTID_POSITION_NOT_FOUND_IN_BINLOG eng "Connecting slave requested to start from GTID %u-%u-%llu, which is not in the master's binlog" ER_CANNOT_LOAD_SLAVE_GTID_STATE - eng "Failed to load replication slave GTID state from table %s.%s" + eng "Failed to load replication slave GTID position from table %s.%s" ER_MASTER_GTID_POS_CONFLICTS_WITH_BINLOG eng "Specified GTID %u-%u-%llu conflicts with the binary log which contains a more recent GTID %u-%u-%llu. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos." ER_MASTER_GTID_POS_MISSING_DOMAIN @@ -6771,3 +6771,5 @@ 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" +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" |