bzr push into mysql-5.5 branch (nuno.carvalho:3686 to 3687)

[Nuno Carvalho]

 3687 Nuno Carvalho	2012-01-16 [merge]
      Automerge from mysql-5.1 to mysql-5.5.

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
 3686 Marko Mäkelä	2012-01-16 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 13:50:29 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2012-01-16 10:02:29 +0000
@@ -59,6 +59,8 @@
 #VARCHAR(M)    
 #
 
+--let $_saved_conn= $CURRENT_CONNECTION
+
 let $binformat = `SHOW VARIABLES LIKE '%binlog_format%'`;
 --echo
 --echo ***********************************************************
@@ -1017,3 +1019,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1
 connection master;
 DROP TABLE t5;
 sync_slave_with_master;
+
+--connection $_saved_conn

No bundle (reason: useless for push emails).