bzr push into mysql-trunk branch (kevin.lewis:3789 to 3790) Bug#13623078

[kevin.lewis]

 3790 kevin.lewis@stripped	2012-01-25
      Bug#13623078 - Use UNIV_PAGE_SIZE instead of 16*1024 for handler::block_size.
      Approved by marko on #innodb
      Tested with 4k, 8k and 16k pages and with PB2 on mysql-trunk-innodb-pb2

    modified:
      storage/innobase/handler/ha_innodb.cc
 3789 Nuno Carvalho	2012-01-25 [merge]
      Merge from mysql-5.5 into mysql-trunk.
      
      Conflicts:
       mysql-test/suite/rpl/r/rpl_heartbeat_basic.result

    modified:
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:nuno.carvalho@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
@@ -4537,7 +4537,7 @@ table_opened:
 	}
 
 	/* Index block size in InnoDB: used by MySQL in query optimization */
-	stats.block_size = 16 * 1024;
+	stats.block_size = UNIV_PAGE_SIZE;
 
 	/* Init table lock structure */
 	thr_lock_data_init(&share->lock,&lock,(void*) 0);

No bundle (reason: useless for push emails).