From: Tor Didriksen
Date: October 31 2011 9:15am
Subject: bzr push into mysql-5.5 branch (tor.didriksen:3587 to 3588)
List-Archive: http://lists.mysql.com/commits/141667
Message-Id: <201110310915.p9V9F5Ss016506@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3588 Tor Didriksen	2011-10-31 [merge]
      null merge 5.1 => 5.5

 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
No bundle (reason: useless for push emails).