diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
| commit | 3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (patch) | |
| tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/share/errmsg.txt | |
| parent | 39f7da882e2a90e8d5eb3f49c4ba361f2b631ad9 (diff) | |
| parent | 0777ef567df6ac183abc45f4ace867e25d6d59a3 (diff) | |
| download | mariadb-git-3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3.tar.gz | |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 1773599c63d..8d18d046643 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -4702,7 +4702,7 @@ ER_NOT_SUPPORTED_YET 42000 swe "Denna version av MySQL kan ännu inte utföra '%s'" ER_MASTER_FATAL_ERROR_READING_BINLOG nla "Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log" - eng "Got fatal error %d: '%-.128s' from master when reading data from binary log" + eng "Got fatal error %d from master when reading data from binary log: '%-.128s'" ger "Schwerer Fehler %d: '%-.128s vom Master beim Lesen des binären Logs" ita "Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario" por "Obteve fatal erro %d: '%-.128s' do master quando lendo dados do binary log" @@ -6209,3 +6209,10 @@ ER_TOO_MANY_CONCURRENT_TRXS WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED eng "Non-ASCII separator arguments are not fully supported" + +ER_DEBUG_SYNC_TIMEOUT + eng "debug sync point wait timed out" + ger "Debug Sync Point Wartezeit überschritten" +ER_DEBUG_SYNC_HIT_LIMIT + eng "debug sync point hit limit reached" + ger "Debug Sync Point Hit Limit erreicht" |