diff options
| author | Andrei Elkin <andrei.elkin@oracle.com> | 2012-01-19 16:44:09 +0200 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@oracle.com> | 2012-01-19 16:44:09 +0200 |
| commit | f91c2d33f4ba3c9b5b69652bd045632c8085f30f (patch) | |
| tree | 3e79f37aaa1e0b87575e2ecd0330488bb948ce85 /sql/share | |
| parent | 8c894564abc55b228cfe9dd87ecde9a7710d94db (diff) | |
| download | mariadb-git-f91c2d33f4ba3c9b5b69652bd045632c8085f30f.tar.gz | |
bug#3593869-64035
A follow-up patch corrects max sizes of printed strings and changes llstr() to %lld.
Credits go to Davi who provided a great feedback.
sql/share/errmsg-utf8.txt:
Max size for the whole message is 512 so a part of - like '%-.512s' should be less,
reduction to 320 is safe and with good chances won't cut off a part of a rather log
message in Last_IO_Error = 'Got fatal error 1236 ...'
sql/sql_repl.cc:
llstr() is replaced by %lld.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 04951f33fc4..f5c96761da1 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -4701,14 +4701,14 @@ ER_NOT_SUPPORTED_YET 42000 spa "Esta versión de MySQL no soporta todavia '%s'" swe "Denna version av MySQL kan ännu inte utföra '%s'" ER_MASTER_FATAL_ERROR_READING_BINLOG - nla "Kreeg fatale fout %d: '%-.512s' van master tijdens lezen van data uit binaire log" - eng "Got fatal error %d from master when reading data from binary log: '%-.512s'" - ger "Schwerer Fehler %d: '%-.512s vom Master beim Lesen des binären Logs" - ita "Errore fatale %d: '%-.512s' dal master leggendo i dati dal log binario" - por "Obteve fatal erro %d: '%-.512s' do master quando lendo dados do binary log" - rus "Получена неисправимая ошибка %d: '%-.512s' от головного сервера в процессе выборки данных из двоичного журнала" - spa "Recibió fatal error %d: '%-.512s' del master cuando leyendo datos del binary log" - swe "Fick fatalt fel %d: '%-.512s' från master vid läsning av binärloggen" + nla "Kreeg fatale fout %d: '%-.320s' van master tijdens lezen van data uit binaire log" + eng "Got fatal error %d from master when reading data from binary log: '%-.320s'" + ger "Schwerer Fehler %d: '%-.320s vom Master beim Lesen des binären Logs" + ita "Errore fatale %d: '%-.320s' dal master leggendo i dati dal log binario" + por "Obteve fatal erro %d: '%-.320s' do master quando lendo dados do binary log" + rus "Получена неисправимая ошибка %d: '%-.320s' от головного сервера в процессе выборки данных из двоичного журнала" + spa "Recibió fatal error %d: '%-.320s' del master cuando leyendo datos del binary log" + swe "Fick fatalt fel %d: '%-.320s' från master vid läsning av binärloggen" ER_SLAVE_IGNORED_TABLE eng "Slave SQL thread ignored the query because of replicate-*-table rules" ger "Slave-SQL-Thread hat die Abfrage aufgrund von replicate-*-table-Regeln ignoriert" |