bzr push into mysql-trunk branch (vasil.dimov:3233 to 3234)

[vasil.dimov]

 3234 Vasil Dimov	2011-06-23
      Do not check that the number of pages for the test table
      is small in innodb_buffer_pool_load.test
      
      The number of pages is nondeterministic and we can safely assume that
      it is small (table not loaded in BP) after
      "-- source include/restart_mysqld.inc".

    modified:
      mysql-test/suite/innodb/r/innodb_buffer_pool_load.result
      mysql-test/suite/innodb/t/innodb_buffer_pool_load.test
 3233 Marko Mäkelä	2011-06-23 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/buf/buf0buddy.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/include/buf0buddy.h
      storage/innobase/include/buf0buddy.ic
      storage/innobase/include/buf0buf.h
=== modified file 'mysql-test/suite/innodb/r/innodb_buffer_pool_load.result'
--- a/mysql-test/suite/innodb/r/innodb_buffer_pool_load.result	revid:marko.makela@stripped30309-e7m10c0boa62nsum
+++ b/mysql-test/suite/innodb/r/innodb_buffer_pool_load.result	revid:vasil.dimov@stripped-20110623132926-cyok7kpe8p12nbs8
@@ -13,10 +13,6 @@ SET GLOBAL innodb_buffer_pool_dump_now =
 select count(*) from ib_bp_test where a = 1;
 count(*)
 1
-SELECT COUNT(*) FROM information_schema.innodb_buffer_page_lru
-WHERE table_name LIKE '%ib_bp_test';
-COUNT(*)
-22
 SET GLOBAL innodb_buffer_pool_load_now = ON;
 SELECT variable_value
 FROM information_schema.global_status

=== modified file 'mysql-test/suite/innodb/t/innodb_buffer_pool_load.test'
--- a/mysql-test/suite/innodb/t/innodb_buffer_pool_load.test	revid:marko.makela@strippednsum
+++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_load.test	revid:vasil.dimov@stripped7kpe8p12nbs8
@@ -67,11 +67,6 @@ EOF
 # Load the table so that entries in the I_S table do not appear as NULL
 select count(*) from ib_bp_test where a = 1;
 
-# The actual number does not matter, it is ok to be adjusted if it changes
-# due to some changes in InnoDB internals or depends on the environment
--- replace_result 20 22 21 22
--- eval $check_cnt
-
 # Load
 SET GLOBAL innodb_buffer_pool_load_now = ON;
 

No bundle (reason: useless for push emails).