List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:January 19 2012 4:02pm
Subject:bzr push into mysql-trunk branch (andrei.elkin:3752)
View as plain text  
 3752 Andrei Elkin	2012-01-19 [merge]
      merging from repo.

    modified:
      storage/innobase/os/os0file.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_start_stop_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test	2012-01-17 22:32:29 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test	2012-01-19 15:55:36 +0000
@@ -179,7 +179,8 @@ DROP TABLE t1;
 sync_slave_with_master;
 
 #
-# bug#3593869-64035 uninitialized event_coordinates instance crashes server
+# bug#3593869-64035 attempt to read a member of event_coordinates
+# referenced by NULL pointer crashes server.
 # Testing how out of valid range position value is handled with an error.
 #
 

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2012-01-17 22:32:29 +0000
+++ b/sql/share/errmsg-utf8.txt	2012-01-19 15:55:36 +0000
@@ -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  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 " '%-.512s' от головного сервера в процессе выборки данных из двоичr %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' от головного сервера в процессе выборки данных из двоичного жуs' del master cuando leyendo datos del binary log"
+        swe "Fick fatalt fel %d: '%-.320s' från master vid l  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"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (andrei.elkin:3752) Andrei Elkin20 Jan