bzr push into mysql-5.5 branch (andrei.elkin:3586 to 3587) Bug#11763573

[Andrei Elkin]

 3587 Andrei Elkin	2011-10-29
      BUG#11763573
      
      post-push fixes for show_slave_io_error= 1 of wait_for_slave_io_error.inc;
      Unix and win format path specifically so few tests have to change show_slave_io_error
      to zero.

    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/t/rpl_log_pos.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/suite/rpl/t/rpl_packet.test
 3586 Andrei Elkin	2011-10-28 [merge]
      merge from 5.5 to local tree.

    modified:
      VERSION
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/terminal.c
      mysql-test/r/archive.result
      mysql-test/r/myisam.result
      mysql-test/t/archive.test
      mysql-test/t/myisam.test
      sql/sql_base.cc
      storage/archive/ha_archive.cc
      storage/innobase/btr/btr0cur.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/row/row0mysql.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_delete_all.c
=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-10-27 14:14:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2011-10-28 21:07:16 +0000
@@ -9,7 +9,6 @@ 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.''
 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-10-27 14:14:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result	2011-10-28 21:07:16 +0000
@@ -5,7 +5,6 @@ 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.''
 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-10-27 14:14:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2011-10-28 21:07:16 +0000
@@ -37,7 +37,6 @@ 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.''
 STOP SLAVE;
 RESET SLAVE;
 RESET MASTER;

=== modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test'
--- a/mysql-test/suite/rpl/t/rpl_log_pos.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_log_pos.test	2011-10-28 21:07:16 +0000
@@ -22,7 +22,12 @@ let $status_items= Read_Master_Log_Pos;
 source include/show_slave_status.inc;
 start slave;
 let $slave_io_errno= 1236;
-let $show_slave_io_error= 1;
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+let $show_slave_io_error= 0;
 source include/wait_for_slave_io_error.inc;
 source include/stop_slave_sql.inc;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_manual_change_index_file.test'
--- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2011-10-28 21:07:16 +0000
@@ -60,7 +60,12 @@ call mtr.add_suppression('Got fatal erro
 connection slave;
 # 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
 --let $slave_io_errno= 1236
---let $show_slave_io_error= 1
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+--let $show_slave_io_error= 0
 --source include/wait_for_slave_io_error.inc
 
 connection master;

=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2011-01-18 17:38:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2011-10-28 21:07:16 +0000
@@ -125,7 +125,12 @@ connection slave;
 # The slave I/O thread must stop after receiving
 # 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master.
 --let $slave_io_errno= 1236
---let $show_slave_io_error= 1
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+--let $show_slave_io_error= 0
 --source include/wait_for_slave_io_error.inc
 
 # Remove the bad binlog and clear error status on slave.

No bundle (reason: useless for push emails).