diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-09-16 18:14:46 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-09-16 18:14:46 +0400 |
| commit | d4f83cc40c03996b2e4dcaa5d9e0a75b815d6d58 (patch) | |
| tree | 7e27cdce393cb3193570c02db63d46ae8dfe0fc3 /sql/share | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| download | mariadb-git-d4f83cc40c03996b2e4dcaa5d9e0a75b815d6d58.tar.gz | |
MDEV-4911 - add KILL query id, and add query id information to processlist
- issue proper error message if query id is not found
- do not allow kill query id 0
- fixed ps-protocol and embedded tests
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 97cff25fa31..44466f4d3ae 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6559,3 +6559,7 @@ 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" 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 + eng "Unknown query id: %lld" + ger "Unbekannte Abfrage-ID: %lld" + rus "Неизвестный номер запроса: %lld" |