diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
| commit | 791b0ab5db47528d93cdaf534114e417ff06b66a (patch) | |
| tree | b47e7bc501a73ce95328dddced35b891d5ac21ba /sql/share | |
| parent | c6d08ecce3e7c18ecaae973c67bd2e547e0db4dd (diff) | |
| parent | 519ad0f7e35ff4dd13aac3c13da44c649f724352 (diff) | |
| download | mariadb-git-791b0ab5db47528d93cdaf534114e417ff06b66a.tar.gz | |
Merge 10.0 -> 10.1
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 9dff16b2be1..6627d33287d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7078,7 +7078,7 @@ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO ER_STORED_FUNCTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO eng "Cannot modify @@session.gtid_domain_id or @@session.gtid_seq_no inside a stored function or trigger" ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2 - eng "Connecting slave requested to start from GTID %u-%u-%llu, which is not in the master's binlog. Since the master's binlog contains GTIDs with higher sequence numbers, it probably means that the slave has diverged due to executing extra errorneous transactions" + eng "Connecting slave requested to start from GTID %u-%u-%llu, which is not in the master's binlog. Since the master's binlog contains GTIDs with higher sequence numbers, it probably means that the slave has diverged due to executing extra erroneous transactions" ER_BINLOG_MUST_BE_EMPTY eng "This operation is not allowed if any GTID has been logged to the binary log. Run RESET MASTER first to erase the log" ER_NO_SUCH_QUERY |