summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-21 17:25:10 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-21 17:25:10 +0400
commitff98b6a2c22cbe14d82dd4e3eb577627d3f988ed (patch)
tree3cfbf406736e7b6f9225d13c59019ac28c01d328 /sql/share
parentdcb8bb23c29172949781f5214b8222505752de70 (diff)
downloadmariadb-git-ff98b6a2c22cbe14d82dd4e3eb577627d3f988ed.tar.gz
Update errmsg-utf8.txt after automerge.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index e8bc2096bf6..62f49250a1a 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.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"
@@ -6203,7 +6203,7 @@ WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
ER_DEBUG_SYNC_TIMEOUT
eng "debug sync point wait timed out"
- ger "Debug Sync Point Wartezeit überschritten"
+ 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"