bzr push into mysql-trunk branch (marko.makela:3231 to 3232)

[marko.makela]

 3232 Marko Mäkelä	2011-06-23 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
 3231 Vasil Dimov	2011-06-23
      Implement WL#5712 InnoDB: preload buffer pool
      
      Also implements the feature request in:
      Bug#58819 preload InnoDB buffer pool option
      BUG 11765816 - 58819: PRELOAD INNODB BUFFER POOL OPTION
      
      This feature implements the possibility to dump and restore the contents
      of the InnoDB buffer pool(s) to/from disk. The main objective is to
      shorten the warm up times after the server has been restarted by loading
      the data that has been loaded before shutdown.
      
      This feature consists of two parts:
      
      == 1. Dumping the buffer pool or part of it on disk. Only tablespace id
         and page id are saved. Pages content is not saved.
      
      == 2. Loading the pages listed in a dump into the buffer pool.
      
      Reviewed by:	Inaam Rana (rb://661)
      Tested by:	Michael Izioumtchenko, Vasil Dimov and PB2

    added:
      mysql-test/suite/innodb/r/innodb_buffer_pool_load.result
      mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt
      mysql-test/suite/innodb/t/innodb_buffer_pool_load.test
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_abort_basic.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_abort_basic.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test
      storage/innobase/buf/buf0dump.c
      storage/innobase/include/buf0dump.h
    modified:
      storage/innobase/CMakeLists.txt
      storage/innobase/buf/buf0rea.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/buf0rea.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/srv0start.h
      storage/innobase/include/ut0ut.h
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/ut/ut0ut.c
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result	revid:vasil.dimov@strippedc0kg3z4b8vo
+++ b/mysql-test/suite/innodb/r/innodb-index.result	revid:marko.makela@stripped9lk2mt6x30y
@@ -1086,7 +1086,8 @@ DROP TABLE t2;
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e');
-CREATE TABLE t2 SELECT * FROM t1;
+CREATE TABLE t2 (a INT, b CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t2 SELECT * FROM t1;
 BEGIN;
 SELECT * FROM t1;
 a	b

=== modified file 'mysql-test/suite/innodb/t/innodb-index.test'
--- a/mysql-test/suite/innodb/t/innodb-index.test	revid:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/t/innodb-index.test	revid:marko.makela@stripped
@@ -519,7 +519,8 @@ connect (b,localhost,root,,);
 connection a;
 CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e');
-CREATE TABLE t2 SELECT * FROM t1;
+CREATE TABLE t2 (a INT, b CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t2 SELECT * FROM t1;
 connection b;
 BEGIN;
 # This acquires a MDL lock on t1 until commit.

Attachment: [text/bzr-bundle] bzr/[e-mail]