bzr push into mysql-trunk branch (hemant.hk.kumar:3992 to 3993)

[Hemant Kumar]

 3993 Hemant Kumar	2012-06-12
      Fixing rpl_packet test failure after discussing it with Joro.

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
 3992 Marc Alff	2012-06-12
      Fixed unit test after removal of 1 alloc.

    modified:
      storage/perfschema/unittest/pfs_instr-oom-t.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2012-06-12 07:31:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2012-06-12 10:33:42 +0000
@@ -29,7 +29,7 @@ connection master;
 let $old_max_allowed_packet= `SELECT @@global.max_allowed_packet`;
 let $old_net_buffer_length= `SELECT @@global.net_buffer_length`;
 let $old_slave_max_allowed_packet= `SELECT @@global.slave_max_allowed_packet`;
-SET @@global.max_allowed_packet=1024;
+SET @@global.max_allowed_packet=10240;
 SET @@global.net_buffer_length=1024;
 
 sync_slave_with_master;
@@ -81,7 +81,7 @@ connection master;
 # MAX_DBS_IN_QUERY_MTS * (1 + NAME_LEN) to make the master not fail to read
 # an event itself.
 
-SET @@global.max_allowed_packet=4096 + (floor(64 * 3 * 254 / 1024) + 1) * 1024;
+SET @@global.max_allowed_packet=4096 + 4096 + (floor(64 * 3 * 254 / 1024) + 1) * 1024;
 SET @@global.net_buffer_length=@@global.max_allowed_packet;
 
 # Restart slave for new setting to take effect

No bundle (reason: useless for push emails).