diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
commit | 7eb789a723582a503e6c7b18afee5b92d39dbbd5 (patch) | |
tree | 4673f5dde3aac3f1173eb33cbd96a67269d48499 /sql/share/errmsg.txt | |
parent | 19c380aaff1f1f3c0d21ac0c18904c21d7bdce76 (diff) | |
parent | 3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (diff) | |
download | mariadb-git-7eb789a723582a503e6c7b18afee5b92d39dbbd5.tar.gz |
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r-- | sql/share/errmsg.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 7afc73582ab..3f58826ed4e 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" @@ -6243,3 +6243,9 @@ ER_MESSAGE_AND_STATEMENT ER_SLAVE_IGNORE_SERVER_IDS eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id" +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" |