From: Andrei Elkin Date: January 22 2012 5:00pm Subject: bzr push into mysql-trunk branch (andrei.elkin:3762 to 3763) List-Archive: http://lists.mysql.com/commits/142503 Message-Id: <201201221700.q0MH0ssJ029769@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3763 Andrei Elkin 2012-01-22 merging the final part of post-fixes from 5.5 bug13593869-64035 branch. modified: 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_stm_start_stop_slave.result sql/rpl_master.cc 3762 Sunny Bains 2012-01-21 Remove extra new line. modified: storage/innobase/trx/trx0trx.cc === modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result' --- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2012-01-19 20:03:07 +0000 +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2012-01-22 17:00:21 +0000 @@ -12,7 +12,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 start event position from 'master-bin.000001' at XXX, the last event was read from 'master-bin.000001' at XXX, the last byte read was read from 'master-bin.000001' at XXX.'' +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 first event 'master-bin.000001' at XXX, the last event read from 'master-bin.000001' at XXX, the last byte read from 'master-bin.000001' at XXX.'' 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 2012-01-19 20:03:07 +0000 +++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2012-01-22 17:00:21 +0000 @@ -8,7 +8,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 start event position from 'master-bin.000001' at XXX, the last event was read from 'master-bin.000002' at XXX, the last byte read was read from 'master-bin.000002' at XXX.'' +Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the first event 'master-bin.000001' at XXX, the last event read from 'master-bin.000002' at XXX, the last byte read from 'master-bin.000002' at XXX.'' 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 2012-01-19 20:03:07 +0000 +++ b/mysql-test/suite/rpl/r/rpl_packet.result 2012-01-22 17:00:21 +0000 @@ -40,7 +40,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 start event position from '' at XXX, the last event was read from 'master-bin.000001' at XXX, the last byte read was read from 'master-bin.000001' at XXX.'' +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 first event '' at XXX, the last event read from 'master-bin.000001' at XXX, the last byte read from 'master-bin.000001' at XXX.'' STOP SLAVE; RESET SLAVE; RESET MASTER; === modified file 'mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result' --- a/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result 2012-01-19 20:03:07 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result 2012-01-22 17:00:21 +0000 @@ -78,7 +78,7 @@ CHANGE MASTER TO master_log_pos=MASTER_P 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: 'Client requested master to start replication from impossible position; the start event position from 'master-bin.000001' at XXX, the last event was read from './master-bin.000001' at XXX, the last byte read was read from './master-bin.000001' at XXX.'' +Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position; the first event 'master-bin.000001' at XXX, the last event read from './master-bin.000001' at XXX, the last byte read from './master-bin.000001' at XXX.'' include/stop_slave.inc RESET SLAVE; RESET MASTER; === modified file 'sql/rpl_master.cc' --- a/sql/rpl_master.cc 2012-01-17 22:32:29 +0000 +++ b/sql/rpl_master.cc 2012-01-22 17:00:21 +0000 @@ -629,7 +629,6 @@ void mysql_binlog_send(THD* thd, char* l String* packet = &thd->packet; int error; const char *errmsg = "Unknown error"; - char llbuff0[22], llbuff1[22], llbuff2[22]; char error_text[MAX_SLAVE_ERRMSG]; // to be send to slave via my_message() NET* net = &thd->net; mysql_mutex_t *log_lock; @@ -1275,12 +1274,14 @@ err: detailing the fatal error message with coordinates of the last position read. */ - const char *fmt= "%s; the start event position from '%s' at %s, the last event was read from '%s' at %s, the last byte read was read from '%s' at %s."; - my_snprintf(error_text, sizeof(error_text), fmt, errmsg, - p_start_coord->file_name, - (llstr(p_start_coord->pos, llbuff0), llbuff0), - p_coord->file_name, (llstr(p_coord->pos, llbuff1), llbuff1), - log_file_name, (llstr(my_b_tell(&log), llbuff2), llbuff2)); + my_snprintf(error_text, sizeof(error_text), + "%s; the first event '%s' at %lld, " + "the last event read from '%s' at %lld, " + "the last byte read from '%s' at %lld.", + errmsg, + p_start_coord->file_name, p_start_coord->pos, + p_coord->file_name, p_coord->pos, + log_file_name, my_b_tell(&log)); } else strcpy(error_text, errmsg); No bundle (reason: useless for push emails).