bzr push into mysql-5.5 branch (ashish.y.agarwal:3704 to 3705) Bug#11754145

[Ashish Agarwal]

 3705 Ashish Agarwal	2012-02-05
      BUG#11754145: Failing test cases. Patch to correct the test case.

    modified:
      mysql-test/include/have_64bit.inc
 3704 Nuno Carvalho	2012-02-03
      BUG#12403008 RPL_HEARTBEAT_BASIC FAILS SPORADICALLY ON PUSHBUILD
            
      rpl_heartbeat_basic test fails sporadically on pushbuild because did
      not received all heartbeats from slave in circular replication.
      
      Removed from experimental collection.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/include/have_64bit.inc'
--- a/mysql-test/include/have_64bit.inc	2012-02-03 13:49:32 +0000
+++ b/mysql-test/include/have_64bit.inc	2012-02-05 08:40:50 +0000
@@ -2,10 +2,10 @@
 # see also have_32bit.inc
 
 --disable_query_log
-let $save = `SELECT @@session.myisam_sort_buffer_size`;
-SET @@session.myisam_sort_buffer_size = 4294967296;
-let $mach64 = `SELECT @@session.myisam_sort_buffer_size > 4294967295`;
-eval SET @@session.myisam_sort_buffer_size = $save;
+let $save = `SELECT @@session.sort_buffer_size`;
+SET @@session.sort_buffer_size = 4294967296;
+let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`;
+eval SET @@session.sort_buffer_size = $save;
 --enable_query_log
 if (!$mach64)
 {

No bundle (reason: useless for push emails).