From: Andrei Elkin Date: September 30 2011 1:15pm Subject: bzr push into mysql-5.5 branch (andrei.elkin:3559 to 3560) List-Archive: http://lists.mysql.com/commits/141244 Message-Id: <201109301315.p8UDFFhQ029433@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3560 Andrei Elkin 2011-09-30 bug#bug11747416 post-push fixes to correct file name print out. modified: mysql-test/suite/rpl/r/rpl_cant_read_event_incident.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 sql/sql_repl.cc 3559 Inaam Rana 2011-09-30 Revert original fix for Bug 12612184 and the follow up fix for Bug 12704861. Bug 12704861 fix was revno: 3504.1.1 (rb://693) Bug 12612184 fix was revno: 3445.1.10 (rb://678) modified: storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/fsp/fsp0fsp.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0cur.h storage/innobase/include/btr0cur.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/fsp0fsp.h storage/innobase/include/mtr0mtr.h storage/innobase/include/mtr0mtr.ic storage/innobase/include/page0cur.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.h storage/innobase/include/univ.i storage/innobase/mtr/mtr0mtr.c storage/innobase/page/page0cur.c storage/innobase/page/page0page.c storage/innobase/row/row0ins.c storage/innobase/row/row0row.c storage/innobase/row/row0upd.c storage/innobase/row/row0vers.c storage/innobase/sync/sync0rw.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0undo.c === modified file 'mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result' --- a/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result 2011-09-29 11:14:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result 2011-09-30 12:58:02 +0000 @@ -11,7 +11,7 @@ reset slave; start slave; include/wait_for_slave_param.inc [Last_IO_Errno] Last_IO_Errno = '1236' -Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event; consider out of disk space on master; the last event was read from ./master-bin.000001 at 316, the last byte read was read from ./master-bin.000001 at 335.'' +Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event; consider out of disk space on master; the last event was read from 'master-bin.000001' at 316, the last byte read was read from 'master-bin.000001' at 335.'' reset master; stop slave; reset slave; === 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:14:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-09-30 12:58:02 +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:14:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2011-09-30 12:58:02 +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 237, the last byte read was read from ./master-bin.000002 at 237.'' +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 237, the last byte read was read from 'master-bin.000002' at 237.'' 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:14:43 +0000 +++ b/mysql-test/suite/rpl/r/rpl_packet.result 2011-09-30 12:58:02 +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 463, the last byte read was read from ./master-bin.000001 at 482.'' +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 463, the last byte read was read from 'master-bin.000001' at 482.'' STOP SLAVE; RESET SLAVE; RESET MASTER; === modified file 'sql/sql_repl.cc' --- a/sql/sql_repl.cc 2011-09-29 11:14:43 +0000 +++ b/sql/sql_repl.cc 2011-09-30 12:58:02 +0000 @@ -447,7 +447,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; @@ -1012,13 +1012,18 @@ end: err: thd_proc_info(thd, "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).