bzr push into mysql-5.6 branch (hemant.hk.kumar:4283 to 4284)

[Hemant Kumar]

 4284 Hemant Kumar	2012-09-17
      Non-functional change-
      Skiping this test from Valgrind execution as per Bug-14627884

    modified:
      mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
 4283 Inaam Rana	2012-09-14
      Bug#14001972 ASSERT PAGE_ZIP_GET_SIZE(&BLOCK->PAGE.ZIP) == ZIP_SIZE,
      ACCESSING SENTINEL 
      
      rb://1300
      approved by: Marko Makela
      
      In buf_page_get_gen() when ibuf_debug is set there is debug code path
      where we try to evict the page if it is found in the buffer pool.
      This is to increase chances of ibuf triggering in. In this code path
      there is a window where we are not holding any mutex and another thread
      can come in and set watch on that page. In that case we choke assuming
      that we have found the real page again.

    modified:
      storage/innobase/buf/buf0buf.cc
=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2012-09-14 10:19:58 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2012-09-17 04:43:03 +0000
@@ -1,5 +1,7 @@
 # Skiping this test from Valgrind execution as per Bug-14627884
 --source include/not_valgrind.inc
+#Considering the time taken for this test on slow solaris platforms making it a big test
+--source include/big_test.inc
 ################################################################################
 # t/partition_alter2_2_1_innodb.test                                           #
 #                                                                              #

No bundle (reason: useless for push emails).