From: Andrei Elkin
Date: September 30 2011 1:15pm
Subject: bzr push into mysql-trunk branch (andrei.elkin:3461 to 3462)
List-Archive: http://lists.mysql.com/commits/141245
Message-Id: <201109301315.p8UDFvE9029451@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3462 Andrei Elkin	2011-09-30 [merge]
      merge from 5.5 and updating results of 4 tests manually.

    modified:
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      sql/rpl_master.cc
 3461 Inaam Rana	2011-09-30 [merge]
      "NULL merge from mysql-5.5"

=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result	2011-09-29 11:55:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2011-09-30 13:14:37 +0000
@@ -64,7 +64,7 @@ insert into t1 values (1) /* will not be
 set @@global.debug='d,simulate_slave_unaware_checksum';
 start slave;
 include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log; the last event was read from ./master-bin.000010 at 114, the last byte read was read from ./master-bin.000010 at 114.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log; the last event was read from 'master-bin.000010' at 114, the last byte read was read from 'master-bin.000010' at 114.''
 select count(*) as zero from t1;
 zero
 0

=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-09-29 11:55:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-09-30 13:14:37 +0000
@@ -9,7 +9,7 @@ change master to master_log_pos=MASTER_L
 Read_Master_Log_Pos = '75'
 start slave;
 include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from ./master-bin.000001 at 75, the last byte read was read from ./master-bin.000001 at 94.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 75, the last byte read was read from 'master-bin.000001' at 94.''
 include/stop_slave_sql.inc
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB

=== modified file 'mysql-test/suite/rpl/r/rpl_manual_change_index_file.result'
--- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-09-29 11:55:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-09-30 13:14:37 +0000
@@ -5,7 +5,7 @@ CREATE TABLE t1(c1 INT);
 FLUSH LOGS;
 call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log');
 include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from ./master-bin.000002 at 251, the last byte read was read from ./master-bin.000002 at 251.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from 'master-bin.000002' at 251, the last byte read was read from 'master-bin.000002' at 251.''
 CREATE TABLE t2(c1 INT);
 FLUSH LOGS;
 CREATE TABLE t3(c1 INT);

=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result	2011-09-29 11:55:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2011-09-30 13:14:37 +0000
@@ -37,7 +37,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM;
 INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet));
 include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from ./master-bin.000001 at 484, the last byte read was read from ./master-bin.000001 at 503.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 484, the last byte read was read from 'master-bin.000001' at 503.''
 STOP SLAVE;
 RESET SLAVE;
 RESET MASTER;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_event_max_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2011-09-29 11:55:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2011-09-30 13:14:37 +0000
@@ -63,7 +63,7 @@ call mtr.add_suppression("Found invalid 
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 drop table t1;
 include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from ./master-bin.000001 at 8098734, the last byte read was read from ./master-bin.000001 at 8098753.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 8098734, the last byte read was read from 'master-bin.000001' at 8098753.''
 ==== clean up ====
 include/stop_slave_sql.inc
 RESET SLAVE;

=== modified file 'sql/rpl_master.cc'
--- a/sql/rpl_master.cc	2011-09-29 11:55:31 +0000
+++ b/sql/rpl_master.cc	2011-09-30 13:14:37 +0000
@@ -629,7 +629,7 @@ void mysql_binlog_send(THD* thd, char* l
   String* packet = &thd->packet;
   int error;
   const char *errmsg = "Unknown error";
-  const char *fmt= "%s; the last event was read from %s at %s, the last byte read was read from %s at %s.";
+  const char *fmt= "%s; the last event was read from '%s' at %s, the last byte read was read from '%s' at %s.";
   char llbuff1[22], llbuff2[22];
   char error_text[MAX_SLAVE_ERRMSG]; // to be send to slave via my_message()
   NET* net = &thd->net;
@@ -1253,13 +1253,18 @@ end:
 err:
   THD_STAGE_INFO(thd, stage_waiting_to_finalize_termination);
   if (my_errno == ER_MASTER_FATAL_ERROR_READING_BINLOG && my_b_inited(&log))
+  {
     /* 
        detailing the fatal error message with coordinates 
        of the last position read.
     */
+    char b_start[FN_REFLEN], b_end[FN_REFLEN];
+    fn_format(b_start, coord->file_name, "", "", MY_REPLACE_DIR);
+    fn_format(b_end,   log_file_name,    "", "", MY_REPLACE_DIR);
     my_snprintf(error_text, sizeof(error_text), fmt, errmsg,
-                coord->file_name, (llstr(coord->pos, llbuff1), llbuff1),
-                log_file_name, (llstr(my_b_tell(&log), llbuff2), llbuff2));
+                b_start, (llstr(coord->pos, llbuff1), llbuff1),
+                b_end, (llstr(my_b_tell(&log), llbuff2), llbuff2));
+  }
   else
     strcpy(error_text, errmsg);
   end_io_cache(&log);

No bundle (reason: useless for push emails).