Merge lp:~percona-dev/percona-server/fb_changes_auto_lru_dump into lp:percona-server/release-5.1.54-12

[Alexey Kopytov]

[lp:~percona-dev/percona-server/fb_changes_auto_lru_dump]

190. By Alexey Kopytov on 2011-01-12

Merged Facebook's changes to innodb_lru_dump_restore.patch:

LRU is dumped to a temporary file first to avoid partially written files
in backups or in case of a crash.

Release the LRU mutex while doing memset and file IO. Should mimimize
the impact on the host during scheduled LRU dump. Basic detection of
LRU cycling should the next page to dump be put back at the head of the
LRU during the unlocked window.

Added option innodb_lru_dump_old_pages to control whether old pages are
included in the LRU dump. The default is to only dump young pages.

Added option innodb_lru_load_max_entries specifying the maximum number
of LRU entries to restore. The default is 512k entries (8GB).
Consecutive pages are merged and only count as one, so you will probably
load more pages than this number of LRU entries.

Switched to writing out LRU in priority order.

Load in LRU priority order, but always merge consecutive pages.

Add status vars for LRU restore progress: lru_restore_total_pages and
lru_restore_loaded_pages.

Added restore rate limiting (restore no more than innodb_io_capacity
pages per second). In my testing, a value of 5000 is fine for a
pre-up-ip warmup, but this should be reduced to 500 before serving
traffic to ensure adequate IO capacity is available for foreground
threads.

[Vadim Tkachenko (vadim-tk)]

The same should be made for 5.5

review: Needs Fixing

[Vadim Tkachenko (vadim-tk)]

KAlexey, we had sorted pre-load in sequantual order, and it provided fast read from disks. I am not sure how fast is load in LRU order
KAlexey, we may want to have it as option which method to use

[Alexey Kopytov (akopytov)]

I think loading in LRU order will be slower in most cases, even though this new approach tries to merge sequential records if they appear in the LRU-ordered list.

OK, will make that optional and resubmit.

Unmerged revisions

190. By Alexey Kopytov on 2011-01-12

Merged Facebook's changes to innodb_lru_dump_restore.patch:

LRU is dumped to a temporary file first to avoid partially written files
in backups or in case of a crash.

Release the LRU mutex while doing memset and file IO. Should mimimize
the impact on the host during scheduled LRU dump. Basic detection of
LRU cycling should the next page to dump be put back at the head of the
LRU during the unlocked window.

Added option innodb_lru_dump_old_pages to control whether old pages are
included in the LRU dump. The default is to only dump young pages.

Added option innodb_lru_load_max_entries specifying the maximum number
of LRU entries to restore. The default is 512k entries (8GB).
Consecutive pages are merged and only count as one, so you will probably
load more pages than this number of LRU entries.

Switched to writing out LRU in priority order.

Load in LRU priority order, but always merge consecutive pages.

Add status vars for LRU restore progress: lru_restore_total_pages and
lru_restore_loaded_pages.

Added restore rate limiting (restore no more than innodb_io_capacity
pages per second). In my testing, a value of 5000 is fine for a
pre-up-ip warmup, but this should be reduced to 500 before serving
traffic to ensure adequate IO capacity is available for foreground
threads.

=== modified file 'innodb_adjust_defaults.patch'
--- innodb_adjust_defaults.patch	2010-12-16 11:35:26 +0000
+++ innodb_adjust_defaults.patch	2011-01-12 17:48:16 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:39:14.000000000 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:43:26.000000000 +0900
-@@ -11210,7 +11210,7 @@
+@@ -11214,7 +11214,7 @@
  static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####",
@@ -17,7 +17,7 @@
  
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11310,7 +11310,7 @@
+@@ -11314,7 +11314,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
    PLUGIN_VAR_NOCMDARG,
    "Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
@@ -26,7 +26,7 @@
  
  static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
    PLUGIN_VAR_RQCMDARG,
-@@ -11555,7 +11555,7 @@
+@@ -11559,7 +11559,7 @@
  static MYSQL_SYSVAR_ULONG(ibuf_active_contract, srv_ibuf_active_contract,
    PLUGIN_VAR_RQCMDARG,
    "Enable/Disable active_contract of insert buffer. 0:disable 1:enable",
@@ -35,7 +35,7 @@
  
  static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
    PLUGIN_VAR_RQCMDARG,
-@@ -11635,8 +11635,8 @@
+@@ -11639,8 +11639,8 @@
  };
  static MYSQL_SYSVAR_ENUM(adaptive_checkpoint, srv_adaptive_checkpoint,
    PLUGIN_VAR_RQCMDARG,
 
=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2010-12-16 11:35:26 +0000
+++ innodb_buffer_pool_shm.patch	2011-01-12 17:48:16 +0000
@@ -675,7 +675,7 @@
  
  static char*	internal_innobase_data_file_path	= NULL;
  
-@@ -2457,6 +2458,7 @@
+@@ -2461,6 +2462,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  	srv_fast_checksum = (ibool) innobase_fast_checksum;
@@ -683,7 +683,7 @@
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11405,6 +11407,16 @@
+@@ -11409,6 +11411,16 @@
    "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
    NULL, NULL, 128*1024*1024L, 32*1024*1024L, LONGLONG_MAX, 1024*1024L);
  
@@ -700,7 +700,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -11680,6 +11692,8 @@
+@@ -11699,6 +11711,8 @@
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
@@ -774,11 +774,10 @@
  #ifndef UNIV_HOTBACKUP
  /*************************************************************//**
  Creates a mutex array to protect a hash table. */
-@@ -327,6 +349,33 @@
- 		}\
+@@ -328,6 +350,33 @@
  	}\
  } while (0)
-+
+ 
 +/********************************************************************//**
 +Align nodes with moving location.*/
 +#define HASH_OFFSET(TABLE, NODE_TYPE, PTR_NAME, FADDR, FOFFSET, BOFFSET) \
@@ -805,9 +804,10 @@
 +		}\
 +	}\
 +} while (0)
- 
++
  /************************************************************//**
  Gets the mutex index for a fold value in a hash table.
+ @return	mutex number */
 diff -ruN a/storage/innodb_plugin/include/os0proc.h b/storage/innodb_plugin/include/os0proc.h
 --- a/storage/innodb_plugin/include/os0proc.h	2010-06-04 00:49:59.000000000 +0900
 +++ b/storage/innodb_plugin/include/os0proc.h	2010-07-14 16:40:16.169321536 +0900
 
=== modified file 'innodb_deadlock_count.patch'
--- innodb_deadlock_count.patch	2010-12-13 11:43:12 +0000
+++ innodb_deadlock_count.patch	2011-01-12 17:48:16 +0000
@@ -31,7 +31,7 @@
 diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
 --- a/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.936991959 +0400
-@@ -673,6 +673,7 @@
+@@ -687,6 +687,7 @@
  	ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
  	ulint innodb_buffer_pool_read_ahead;	/*!< srv_read_ahead */
  	ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
@@ -53,7 +53,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.936991959 +0400
-@@ -438,7 +438,7 @@
+@@ -452,7 +452,7 @@
  static ulint	srv_n_rows_updated_old		= 0;
  static ulint	srv_n_rows_deleted_old		= 0;
  static ulint	srv_n_rows_read_old		= 0;
@@ -62,7 +62,7 @@
  UNIV_INTERN ulint		srv_n_lock_wait_count		= 0;
  UNIV_INTERN ulint		srv_n_lock_wait_current_count	= 0;
  UNIV_INTERN ib_int64_t	srv_n_lock_wait_time		= 0;
-@@ -2149,6 +2149,8 @@
+@@ -2163,6 +2163,8 @@
  		= UT_LIST_GET_LEN(buf_pool->flush_list);
  	export_vars.innodb_buffer_pool_pages_free
  		= UT_LIST_GET_LEN(buf_pool->free);
 
=== modified file 'innodb_fast_checksum.patch'
--- innodb_fast_checksum.patch	2010-12-16 11:35:26 +0000
+++ innodb_fast_checksum.patch	2011-01-12 17:48:16 +0000
@@ -170,7 +170,7 @@
  static my_bool	innobase_extra_undoslots		= FALSE;
  static my_bool	innobase_fast_recovery			= FALSE;
  static my_bool	innobase_recovery_stats			= TRUE;
-@@ -2394,6 +2395,7 @@
+@@ -2398,6 +2399,7 @@
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
@@ -178,7 +178,7 @@
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11105,6 +11107,15 @@
+@@ -11109,6 +11111,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -194,7 +194,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11597,6 +11608,7 @@
+@@ -11616,6 +11627,7 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(checksums),
@@ -301,7 +301,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:40:36.599058304 +0900
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:42:03.647012289 +0900
-@@ -383,6 +383,7 @@
+@@ -397,6 +397,7 @@
  
  UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;
  UNIV_INTERN ibool	srv_use_checksums = TRUE;
 
=== modified file 'innodb_fast_shutdown.patch'
--- innodb_fast_shutdown.patch	2010-12-13 11:43:12 +0000
+++ innodb_fast_shutdown.patch	2011-01-12 17:48:16 +0000
@@ -11,6 +11,7 @@
 # suite.
 #
 # The patch also implements os_event_wait_time() for POSIX systems.
+diff -ruN /dev/null b/COPYING.innodb_fast_shutdown
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ b/COPYING.innodb_fast_shutdown	2010-11-16 21:37:51.000000000 +0300
 @@ -0,0 +1,10 @@
@@ -24,6 +25,7 @@
 +    * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 +
 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff -ruN a/storage/innodb_plugin/include/os0sync.h b/storage/innodb_plugin/include/os0sync.h
 --- a/storage/innodb_plugin/include/os0sync.h	2010-11-16 21:33:00.000000000 +0300
 +++ b/storage/innodb_plugin/include/os0sync.h	2010-11-16 21:34:06.000000000 +0300
 @@ -189,14 +189,14 @@
@@ -43,6 +45,7 @@
  				OS_SYNC_INFINITE_TIME */
  #ifdef __WIN__
  /**********************************************************//**
+diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
 --- a/storage/innodb_plugin/include/srv0srv.h	2010-11-16 21:33:00.000000000 +0300
 +++ b/storage/innodb_plugin/include/srv0srv.h	2010-11-16 21:34:06.000000000 +0300
 @@ -57,6 +57,9 @@
@@ -55,6 +58,7 @@
  /* If the last data file is auto-extended, we add this many pages to it
  at a time */
  #define SRV_AUTO_EXTEND_INCREMENT	\
+diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
 --- a/storage/innodb_plugin/log/log0log.c	2010-11-16 21:33:00.000000000 +0300
 +++ b/storage/innodb_plugin/log/log0log.c	2010-11-16 21:34:06.000000000 +0300
 @@ -3103,6 +3103,7 @@
@@ -65,6 +69,7 @@
  loop:
  	os_thread_sleep(100000);
  
+diff -ruN a/storage/innodb_plugin/os/os0sync.c b/storage/innodb_plugin/os/os0sync.c
 --- a/storage/innodb_plugin/os/os0sync.c	2010-11-16 21:33:00.000000000 +0300
 +++ b/storage/innodb_plugin/os/os0sync.c	2010-11-16 21:34:06.000000000 +0300
 @@ -31,6 +31,9 @@
@@ -157,9 +162,10 @@
  #endif
  }
  
+diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-11-16 21:33:00.000000000 +0300
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-11-16 21:34:06.000000000 +0300
-@@ -707,6 +707,8 @@
+@@ -721,6 +721,8 @@
  
  UNIV_INTERN os_event_t	srv_lock_timeout_thread_event;
  
@@ -168,7 +174,7 @@
  UNIV_INTERN srv_sys_t*	srv_sys	= NULL;
  
  /* padding to prevent other memory update hotspots from residing on
-@@ -1012,6 +1014,7 @@
+@@ -1026,6 +1028,7 @@
  	}
  
  	srv_lock_timeout_thread_event = os_event_create(NULL);
@@ -176,7 +182,7 @@
  
  	for (i = 0; i < SRV_MASTER + 1; i++) {
  		srv_n_threads_active[i] = 0;
-@@ -2239,7 +2242,7 @@
+@@ -2257,7 +2260,7 @@
  	/* Wake up every 5 seconds to see if we need to print
  	monitor information. */
  
@@ -185,7 +191,7 @@
  
  	current_time = time(NULL);
  
-@@ -2381,7 +2384,7 @@
+@@ -2399,7 +2402,7 @@
  	/* When someone is waiting for a lock, we wake up every second
  	and check if a timeout has passed for a lock wait */
  
@@ -194,7 +200,7 @@
  
  	srv_lock_timeout_active = TRUE;
  
-@@ -2546,7 +2549,7 @@
+@@ -2564,7 +2567,7 @@
  
  	fflush(stderr);
  
@@ -203,16 +209,16 @@
  
  	if (srv_shutdown_state < SRV_SHUTDOWN_CLEANUP) {
  
-@@ -2590,7 +2593,7 @@
+@@ -2612,7 +2615,7 @@
  	last_dump_time = time(NULL);
  
  loop:
--	os_thread_sleep(5000000);
+-	os_thread_sleep(1000000);
 +	os_event_wait_time(srv_shutdown_event, 5000000);
  
  	if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
  		goto exit_func;
-@@ -2770,7 +2773,7 @@
+@@ -2792,7 +2795,7 @@
  		if (!skip_sleep) {
  		if (next_itr_time > cur_time) {
  
@@ -221,7 +227,7 @@
  			srv_main_sleeps++;
  
  			/*
-@@ -3476,9 +3479,10 @@
+@@ -3498,9 +3501,10 @@
  		mutex_exit(&kernel_mutex);
  
  		sleep_ms = 10;
 
=== modified file 'innodb_files_extend.patch'
--- innodb_files_extend.patch	2010-12-16 11:35:26 +0000
+++ innodb_files_extend.patch	2011-01-12 17:48:16 +0000
@@ -89,7 +89,7 @@
  static my_bool innobase_thread_concurrency_timer_based;
  static long long innobase_buffer_pool_size, innobase_log_file_size;
  
-@@ -2084,6 +2087,62 @@
+@@ -2088,6 +2091,62 @@
  	}
  #endif /* UNIV_DEBUG */
  
@@ -152,7 +152,7 @@
  #ifndef MYSQL_SERVER
  	innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7004,9 +7063,9 @@
+@@ -7008,9 +7067,9 @@
  				| DICT_TF_COMPACT
  				| DICT_TF_FORMAT_ZIP
  				<< DICT_TF_FORMAT_SHIFT;
@@ -165,7 +165,7 @@
  		}
  	}
  
-@@ -11116,6 +11175,16 @@
+@@ -11120,6 +11179,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -182,7 +182,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11604,6 +11673,8 @@
+@@ -11623,6 +11692,8 @@
    NULL, NULL, 0, 0, 1, 0);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {
 
=== modified file 'innodb_fix_misc.patch'
--- innodb_fix_misc.patch	2010-12-20 21:54:44 +0000
+++ innodb_fix_misc.patch	2011-01-12 17:48:16 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:50:59.626327847 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:55:20.281021252 +0900
-@@ -11770,7 +11770,7 @@
+@@ -11791,7 +11791,7 @@
    &innobase_storage_engine,
    innobase_hton_name,
    "Innobase Oy",
 
=== modified file 'innodb_lru_dump_restore.patch'
--- innodb_lru_dump_restore.patch	2010-12-22 18:24:52 +0000
+++ innodb_lru_dump_restore.patch	2011-01-12 17:48:16 +0000
@@ -5,50 +5,67 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
+diff -ruN /dev/null b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result	2010-12-22 20:48:19.000000000 +0300
++++ b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result	2011-01-12 19:38:48.000000000 +0300
 @@ -0,0 +1,7 @@
 +#
-+# LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't 
++# LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't
 +#                 exist
 +#
 +SELECT @@innodb_auto_lru_dump;
 +@@innodb_auto_lru_dump
 +300
+diff -ruN /dev/null b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt	2010-12-22 20:25:59.000000000 +0300
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt	2011-01-11 19:07:54.000000000 +0300
 @@ -0,0 +1 @@
 +--innodb_auto_lru_dump=300
+diff -ruN /dev/null b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test	2010-12-22 20:17:57.000000000 +0300
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test	2011-01-12 19:38:37.000000000 +0300
 @@ -0,0 +1,17 @@
 +--source include/have_innodb_plugin.inc
 +
 +--echo #
-+--echo # LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't 
++--echo # LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't
 +--echo #                 exist
 +--echo #
 +
 +SELECT @@innodb_auto_lru_dump;
 +
-+# We want to check that the server does not crash on startup when there is no 
++# We want to check that the server does not crash on startup when there is no
 +# ib_lru_dump in the datadir. If we are here, we have already started up
-+# successfully. So we only have to check that there is no ib_lru_dump in the 
++# successfully. So we only have to check that there is no ib_lru_dump in the
 +# datadir.
 +
 +--let $MYSQLD_DATADIR= `SELECT @@datadir`
 +--error 1
 +--file_exists $MYSQLD_DATADIR/ib_lru_dump;
 diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
---- a/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:13:11.070058073 +0900
-+++ b/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:34:33.860400549 +0900
-@@ -2122,6 +2122,278 @@
+--- a/storage/innodb_plugin/buf/buf0lru.c	2011-01-11 19:07:52.000000000 +0300
++++ b/storage/innodb_plugin/buf/buf0lru.c	2011-01-12 19:37:29.000000000 +0300
+@@ -48,6 +48,7 @@
+ #include "page0zip.h"
+ #include "log0recv.h"
+ #include "srv0srv.h"
++#include "srv0start.h"
+ 
+ /** The number of blocks from the LRU_old pointer onward, including
+ the block pointed to, must be buf_LRU_old_ratio/BUF_LRU_OLD_RATIO_DIV
+@@ -2122,6 +2123,445 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
  
 +/********************************************************************//**
-+Dump the LRU page list to the specific file. */
++Dump the LRU page list to the specific file.
++
++The format of the file is a list of (space id, page id) pairs, written in
++big-endian format, followed by the pair (0xFFFFFFFF, 0xFFFFFFFF).  The order of
++the pages is the order in which they appear in the LRU, from most recent access
++to oldest access.  */
 +#define LRU_DUMP_FILE "ib_lru_dump"
++#define LRU_DUMP_TEMP_FILE "ib_lru_dump.tmp"
 +
 +UNIV_INTERN
 +ibool
@@ -60,10 +77,13 @@
 +	byte*		buffer_base = NULL;
 +	byte*		buffer = NULL;
 +	buf_page_t*	bpage;
++	buf_page_t*	first_bpage;
 +	ulint		buffers;
 +	ulint		offset;
-+	ibool		ret = FALSE;
++	ulint		pages_written;
 +	ulint		i;
++	ulint		total_pages;
++	mutex_t* 	next_block_mutex;
 +
 +	for (i = 0; i < srv_n_data_files; i++) {
 +		if (strstr(srv_data_file_names[i], LRU_DUMP_FILE) != NULL) {
@@ -83,8 +103,8 @@
 +		goto end;
 +	}
 +
-+	dump_file = os_file_create(LRU_DUMP_FILE, OS_FILE_OVERWRITE,
-+				OS_FILE_NORMAL, OS_DATA_FILE, &success);
++	dump_file = os_file_create(LRU_DUMP_TEMP_FILE, OS_FILE_OVERWRITE,
++				   OS_FILE_NORMAL, OS_DATA_FILE, &success);
 +	if (!success) {
 +		os_file_get_last_error(TRUE);
 +		fprintf(stderr,
@@ -92,13 +112,27 @@
 +		goto end;
 +	}
 +
++	memset(buffer, 0, UNIV_PAGE_SIZE);
++
++	/* walk the buffer pool from most recent to oldest */
 +	mutex_enter(&LRU_list_mutex);
-+	bpage = UT_LIST_GET_LAST(buf_pool->LRU);
-+
-+	buffers = offset = 0;
-+	while (bpage != NULL) {
-+		if (offset == 0) {
-+			memset(buffer, 0, UNIV_PAGE_SIZE);
++	bpage = first_bpage = UT_LIST_GET_FIRST(buf_pool->LRU);
++	total_pages = UT_LIST_GET_LEN(buf_pool->LRU);
++
++	buffers = offset = pages_written = 0;
++	while (bpage != NULL &&
++		(srv_lru_dump_old_pages || !buf_page_is_old(bpage)) &&
++		(pages_written++ < total_pages)) {
++
++		buf_page_t*	next_bpage = UT_LIST_GET_NEXT(LRU, bpage);
++
++		if (next_bpage == first_bpage) {
++			buf_pool_mutex_exit();
++			fprintf(stderr,
++				" InnoDB: detected cycle in LRU, skipping "
++				"dump\n");
++			success = FALSE;
++			goto end;
 +		}
 +
 +		mach_write_to_4(buffer + offset * 4, bpage->space);
@@ -106,51 +140,84 @@
 +		mach_write_to_4(buffer + offset * 4, bpage->offset);
 +		offset++;
 +
-+		if (offset == UNIV_PAGE_SIZE/4) {
-+			success = os_file_write(LRU_DUMP_FILE, dump_file, buffer,
-+					(buffers << UNIV_PAGE_SIZE_SHIFT) & 0xFFFFFFFFUL,
-+					(buffers >> (32 - UNIV_PAGE_SIZE_SHIFT)),
++		/* write out one page of data at a time */
++		if (offset < UNIV_PAGE_SIZE / 4) {
++			bpage = next_bpage;
++			continue;
++		}
++
++		/* while writing file, release buffer pool mutex but
++		 keep the next page fixed so we don't worry about
++		 our list iterator becoming invalid */
++		if (next_bpage) {
++			next_block_mutex = buf_page_get_mutex(next_bpage);
++
++			mutex_enter(next_block_mutex);
++			next_bpage->buf_fix_count++;
++			mutex_exit(next_block_mutex);
++		}
++		mutex_exit(&LRU_list_mutex);
++
++		success = os_file_write(LRU_DUMP_TEMP_FILE, dump_file,
++					buffer,
++					(buffers << UNIV_PAGE_SIZE_SHIFT) &
++					0xFFFFFFFFUL,
++					(buffers >>
++					 (32 - UNIV_PAGE_SIZE_SHIFT)),
 +					UNIV_PAGE_SIZE);
-+			if (!success) {
-+				mutex_exit(&LRU_list_mutex);
-+				fprintf(stderr,
-+					" InnoDB: cannot write page %lu of %s\n",
-+					buffers, LRU_DUMP_FILE);
-+				goto end;
-+			}
-+			buffers++;
-+			offset = 0;
-+		}
-+
-+		bpage = UT_LIST_GET_PREV(LRU, bpage);
++		memset(buffer, 0, UNIV_PAGE_SIZE);
++
++		buf_pool_mutex_enter();
++		if (next_bpage) {
++			mutex_enter(next_block_mutex);
++			next_bpage->buf_fix_count--;
++			mutex_exit(next_block_mutex);
++		}
++		if (!success) {
++			mutex_exit(&LRU_list_mutex);
++			fprintf(stderr,
++				" InnoDB: cannot write page %lu of %s\n",
++				buffers, LRU_DUMP_TEMP_FILE);
++			goto end;
++		}
++		buffers++;
++		offset = 0;
++
++		bpage = next_bpage;
 +	}
 +	mutex_exit(&LRU_list_mutex);
 +
-+	if (offset == 0) {
-+		memset(buffer, 0, UNIV_PAGE_SIZE);
-+	}
-+
-+	mach_write_to_4(buffer + offset * 4, 0xFFFFFFFFUL);
-+	offset++;
-+	mach_write_to_4(buffer + offset * 4, 0xFFFFFFFFUL);
-+	offset++;
-+
-+	success = os_file_write(LRU_DUMP_FILE, dump_file, buffer,
-+			(buffers << UNIV_PAGE_SIZE_SHIFT) & 0xFFFFFFFFUL,
-+			(buffers >> (32 - UNIV_PAGE_SIZE_SHIFT)),
-+			UNIV_PAGE_SIZE);
++	/* mark end of file with 0xFFFFFFFF */
++	mach_write_to_4(buffer + offset * 4, 0xFFFFFFFFUL);
++	offset++;
++	mach_write_to_4(buffer + offset * 4, 0xFFFFFFFFUL);
++	offset++;
++
++	success = os_file_write(LRU_DUMP_TEMP_FILE, dump_file, buffer,
++				(buffers << UNIV_PAGE_SIZE_SHIFT) &
++				0xFFFFFFFFUL,
++				(buffers >> (32 - UNIV_PAGE_SIZE_SHIFT)),
++				UNIV_PAGE_SIZE);
 +	if (!success) {
 +		goto end;
 +	}
 +
-+	ret = TRUE;
 +end:
-+	if (dump_file != -1)
++	if (dump_file != -1) {
++		if (success) {
++			success = os_file_flush(dump_file);
++		}
 +		os_file_close(dump_file);
-+	if (buffer_base)
++	}
++	if (success) {
++		success = os_file_rename(LRU_DUMP_TEMP_FILE,
++					LRU_DUMP_FILE);
++	}
++	if (buffer_base) {
 +		ut_free(buffer_base);
++	}
 +
-+	return(ret);
++	return(success);
 +}
 +
 +typedef struct {
@@ -173,7 +240,16 @@
 +}
 +
 +/********************************************************************//**
-+Read the pages based on the specific file.*/
++Read the pages based on the specific file.
++
++Pre-warms the buffer pool by loading the buffer pool pages recorded in
++LRU_DUMP_FILE by automatic or manual invocation of buf_LRU_file_dump.
++
++The pages are loaded in LRU priority order to ensure the most frequently
++accessed pages are loaded first.  While loading in LRU priority order, any
++lower priority pages that are logically adjacent to higher priority pages are
++loaded along with the higher priority page.  The goal is to maximize the size
++of the data reads without introducing many additional seeks.*/
 +UNIV_INTERN
 +ibool
 +buf_LRU_file_restore(void)
@@ -190,9 +266,17 @@
 +	ibool		terminated = FALSE;
 +	ibool		ret = FALSE;
 +	dump_record_t*	records = NULL;
++	dump_record_t*	sorted_records = NULL;
++	dump_record_t*	current_record;
++	dump_record_t*	prev_record;
++	dump_record_t*	next_record;
++	unsigned char*	records_loaded = NULL;
 +	ulint		size;
 +	ulint		size_high;
 +	ulint		length;
++	ulint		nrecs;
++	ulint		recsize = sizeof(dump_record_t);
++	ullint		loop_timer;
 +
 +	dump_file = os_file_create_simple_no_error_handling(
 +		LRU_DUMP_FILE, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success);
@@ -202,16 +286,20 @@
 +			" InnoDB: cannot open %s\n", LRU_DUMP_FILE);
 +		goto end;
 +	}
-+	if (size == 0 || size_high > 0 || size % 8) {
++	if (size == 0 || size_high > 0 || size % recsize) {
 +		fprintf(stderr, " InnoDB: broken LRU dump file\n");
 +		goto end;
 +	}
 +	buffer_base = ut_malloc(2 * UNIV_PAGE_SIZE);
 +	buffer = ut_align(buffer_base, UNIV_PAGE_SIZE);
-+	records = ut_malloc(size);
-+	if (!buffer || !records) {
++
++	nrecs = size / recsize;
++	records = ut_malloc(nrecs * recsize);
++	sorted_records = ut_malloc(nrecs * recsize);
++	records_loaded = ut_malloc(nrecs * sizeof(unsigned char));
++	if (!buffer || !records || !sorted_records || !records_loaded) {
 +		fprintf(stderr,
-+			" InnoDB: cannot allocate buffer.\n");
++			" InnoDB: cannot allocate buffer(s).\n");
 +		goto end;
 +	}
 +
@@ -236,6 +324,7 @@
 +
 +			space_id = mach_read_from_4(buffer + offset * 4);
 +			page_no = mach_read_from_4(buffer + (offset + 1) * 4);
++			/* found list terminator value 0xFFFFFFFF */
 +			if (space_id == 0xFFFFFFFFUL
 +			    || page_no == 0xFFFFFFFFUL) {
 +				terminated = TRUE;
@@ -263,9 +352,26 @@
 +		buffers++;
 +	}
 +
-+	qsort(records, length, sizeof(dump_record_t), dump_record_cmp);
-+
-+	for (offset = 0; offset < length; offset++) {
++	srv_lru_restore_total_pages = length;
++	srv_lru_restore_loaded_pages = 0;
++
++	/* Copy the records into a second array and sort them, this will
++	allow us to identify sequential records so we can load contiguous
++	data while still prioritizing based on LRU order in the original */
++	memcpy(sorted_records, records, length * recsize);
++	qsort(sorted_records, length, recsize, dump_record_cmp);
++
++	/* As we will be loading data in a new order, we use this array to
++	track which records have already been loaded */
++	memset(records_loaded, 0, length * sizeof(unsigned char));
++
++	/* start time */
++	loop_timer= ut_time_us(NULL);
++
++	/* iterate over the LRU in priority order */
++	for (offset = 0;
++	     offset < ut_min(length, srv_lru_load_max_entries);
++	     offset++) {
 +		ulint		space_id;
 +		ulint		page_no;
 +		ulint		zip_size;
@@ -273,29 +379,97 @@
 +		ib_int64_t	tablespace_version;
 +
 +		space_id = records[offset].space_id;
-+		page_no = records[offset].page_no;
-+
-+		if (offset % 16 == 15) {
-+			os_aio_simulated_wake_handler_threads();
-+			buf_flush_free_margin(FALSE);
-+		}
-+
 +		zip_size = fil_space_get_zip_size(space_id);
 +		if (UNIV_UNLIKELY(zip_size == ULINT_UNDEFINED)) {
 +			continue;
 +		}
 +
-+		if (fil_area_is_exist(space_id, zip_size, page_no, 0,
-+				      zip_size ? zip_size : UNIV_PAGE_SIZE)) {
++		/* we iterate over the LRU in priority order, but want to find
++		the record's position in the sorted array so we can look for
++		consecutive runs */
++		current_record = bsearch(records + offset, sorted_records,
++					 length, sizeof(dump_record_t),
++					 dump_record_cmp);
++		ut_ad(current_record);
++
++		/* check if we already loaded this record as part of another
++		consecutive run */
++		if (records_loaded[current_record - sorted_records]) {
++			continue;
++		}
++
++		/* step backwards in the sorted array until we find the start
++		of this run of consecutive pages */
++		while (current_record > sorted_records) {
++			prev_record = current_record - 1;
++
++			if (prev_record->space_id != current_record->space_id ||
++			    prev_record->page_no + 1 !=
++			    current_record->page_no) {
++				break;
++			}
++
++			current_record = prev_record;
++		}
++
++		/* now step forwards requesting consecutive pages */
++		while (current_record < sorted_records + length) {
++			if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
++				os_aio_simulated_wake_handler_threads();
++				goto end;
++			}
++
++			records_loaded[current_record - sorted_records] = TRUE;
++
++			page_no = current_record->page_no;
++
++			if (!fil_area_is_exist(space_id, zip_size, page_no, 0,
++					       zip_size ?
++					       zip_size : UNIV_PAGE_SIZE)) {
++				break;
++			}
 +
 +			tablespace_version = fil_space_get_version(space_id);
 +
 +			req++;
-+			reads += buf_read_page_low(&err, FALSE, BUF_READ_ANY_PAGE
-+						   | OS_AIO_SIMULATED_WAKE_LATER,
++
++			/* do not issue more than srv_io_capacity requests per
++			second */
++			if (req % srv_io_capacity == 0) {
++				os_aio_simulated_wake_handler_threads();
++				buf_flush_free_margin(FALSE);
++
++				ullint loop_usecs = ut_time_us(NULL) -
++					loop_timer;
++
++				if (loop_usecs < 1000000) {
++					os_thread_sleep(1000000 - loop_usecs);
++				}
++
++				loop_timer = ut_time_us(NULL);
++			}
++
++			reads += buf_read_page_low(&err,
++						   FALSE,
++						   BUF_READ_ANY_PAGE |
++						   OS_AIO_SIMULATED_WAKE_LATER,
 +						   space_id, zip_size, TRUE,
-+						   tablespace_version, page_no, NULL);
++						   tablespace_version, page_no,
++						   NULL);
 +			buf_LRU_stat_inc_io();
++
++			srv_lru_restore_loaded_pages++;
++
++			next_record = current_record + 1;
++
++			if (next_record >= sorted_records + length ||
++			    current_record->space_id != next_record->space_id ||
++			    current_record->page_no + 1 !=
++			    next_record->page_no) {
++				break;
++			}
++
++			current_record = next_record;
 +		}
 +	}
 +
@@ -314,6 +488,10 @@
 +		ut_free(buffer_base);
 +	if (records)
 +		ut_free(records);
++	if (sorted_records)
++		ut_free(sorted_records);
++	if (records_loaded)
++		ut_free(records_loaded);
 +
 +	return(ret);
 +}
@@ -322,8 +500,8 @@
  /**********************************************************************//**
  Validates the LRU list.
 diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:32:40.293411717 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:34:33.863409016 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/buf/buf0rea.c	2011-01-12 19:46:02.000000000 +0300
 @@ -56,7 +56,7 @@
  which case it is never read into the pool, or if the tablespace does
  not exist or is being dropped 
@@ -334,8 +512,8 @@
  buf_read_page_low(
  /*==============*/
 diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:32:40.298411400 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:34:33.868058362 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/fil/fil0fil.c	2011-01-12 19:46:02.000000000 +0300
 @@ -4915,6 +4915,78 @@
  	return(DB_SUCCESS);
  }
@@ -416,32 +594,60 @@
  /**********************************************************************//**
  Waits for an aio operation to complete. This function is used to write the
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 09:57:56.486228425 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 10:00:13.292228546 +0900
-@@ -11473,6 +11473,12 @@
+--- a/storage/innodb_plugin/handler/ha_innodb.cc	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/handler/ha_innodb.cc	2011-01-12 19:46:02.000000000 +0300
+@@ -554,6 +554,10 @@
+   (char*) &export_vars.innodb_log_write_requests,	  SHOW_LONG},
+   {"log_writes",
+   (char*) &export_vars.innodb_log_writes,		  SHOW_LONG},
++  {"lru_restore_loaded_pages",
++  (char*) &export_vars.innodb_lru_restore_loaded_pages,	  SHOW_LONG},
++  {"lru_restore_total_pages",
++  (char*) &export_vars.innodb_lru_restore_total_pages,	  SHOW_LONG},
+   {"os_log_fsyncs",
+   (char*) &export_vars.innodb_os_log_fsyncs,		  SHOW_LONG},
+   {"os_log_pending_fsyncs",
+@@ -11473,6 +11477,27 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
 +static MYSQL_SYSVAR_UINT(auto_lru_dump, srv_auto_lru_dump,
 +  PLUGIN_VAR_RQCMDARG,
 +  "Time in seconds between automatic buffer pool dumps. "
-+  "0 (the default) disables automatic dumps.",
++  "0 (the default) disables automatic dumps. A non-zero value "
++  "also enables restoring LRU automatically on startup.",
 +  NULL, NULL, 0, 0, UINT_MAX32, 0);
 +
++static MYSQL_SYSVAR_ULONG(lru_load_max_entries, srv_lru_load_max_entries,
++  PLUGIN_VAR_RQCMDARG,
++  "Maximum number of LRU entries to restore.  The default is 512k entries. "
++  "Consecutive pages are merged and only count as one, so you will probably "
++  "load more pages than this number of LRU entries.",
++  NULL, NULL, 512*1024UL, 1UL, ULONG_MAX, 0);
++
++static MYSQL_SYSVAR_BOOL(lru_dump_old_pages, srv_lru_dump_old_pages,
++  PLUGIN_VAR_NOCMDARG,
++  "If enabled, will also dump old pages from the LRU. "
++  "The default is to only dump young pages.",
++  NULL, NULL, FALSE);
++
++
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11555,6 +11561,7 @@
+@@ -11555,6 +11580,9 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
 +  MYSQL_SYSVAR(auto_lru_dump),
++  MYSQL_SYSVAR(lru_load_max_entries),
++  MYSQL_SYSVAR(lru_dump_old_pages),
    MYSQL_SYSVAR(use_purge_thread),
    NULL
  };
 diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:29:12.540979608 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:34:33.873058189 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/handler/i_s.cc	2011-01-12 19:46:02.000000000 +0300
 @@ -46,6 +46,7 @@
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
@@ -488,8 +694,8 @@
  	field_store_string(i_s_table->field[0],
  		"Undefined XTRA_* command.");
 diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:32:40.313021803 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:34:33.871059345 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2011-01-12 19:46:02.000000000 +0300
 @@ -41,5 +41,6 @@
  {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -498,8 +704,8 @@
  {NULL, NULL, NULL, NULL}
  };
 diff -ruN a/storage/innodb_plugin/include/buf0lru.h b/storage/innodb_plugin/include/buf0lru.h
---- a/storage/innodb_plugin/include/buf0lru.h	2010-08-27 16:13:11.085978393 +0900
-+++ b/storage/innodb_plugin/include/buf0lru.h	2010-08-27 16:34:33.875100517 +0900
+--- a/storage/innodb_plugin/include/buf0lru.h	2011-01-11 19:07:52.000000000 +0300
++++ b/storage/innodb_plugin/include/buf0lru.h	2011-01-11 19:07:54.000000000 +0300
 @@ -213,6 +213,18 @@
  void
  buf_LRU_stat_update(void);
@@ -520,8 +726,8 @@
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  /**********************************************************************//**
 diff -ruN a/storage/innodb_plugin/include/buf0rea.h b/storage/innodb_plugin/include/buf0rea.h
---- a/storage/innodb_plugin/include/buf0rea.h	2010-08-27 16:32:40.314021595 +0900
-+++ b/storage/innodb_plugin/include/buf0rea.h	2010-08-27 16:34:33.877059445 +0900
+--- a/storage/innodb_plugin/include/buf0rea.h	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/include/buf0rea.h	2011-01-11 19:07:54.000000000 +0300
 @@ -31,6 +31,37 @@
  #include "buf0types.h"
  
@@ -561,8 +767,8 @@
  buffer buf_pool if it is not already there. Sets the io_fix flag and sets
  an exclusive lock on the buffer frame. The flag is cleared and the x-lock
 diff -ruN a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:32:40.315012507 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:34:33.878063455 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/include/fil0fil.h	2011-01-12 19:46:02.000000000 +0300
 @@ -643,6 +643,22 @@
  	void*	message,	/*!< in: message for aio handler if non-sync
  				aio used, else ignored */
@@ -587,19 +793,33 @@
  Waits for an aio operation to complete. This function is used to write the
  handler for completed requests. The aio array of pending requests is divided
 diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-10-01 09:57:56.500228711 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-10-01 10:00:13.302223409 +0900
-@@ -334,6 +334,9 @@
+--- a/storage/innodb_plugin/include/srv0srv.h	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/include/srv0srv.h	2011-01-12 19:46:02.000000000 +0300
+@@ -334,6 +334,23 @@
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
  
 +/** Time in seconds between automatic buffer pool dumps */
 +extern uint srv_auto_lru_dump;
 +
++/** Maximum number of LRU entries to restore
++Consecutive pages are merged and only count as one, so you will probably
++load more pages than this number of LRU entries. */
++extern ulint srv_lru_load_max_entries;
++
++/** If enabled, will also dump old pages from the LRU */
++extern my_bool srv_lru_dump_old_pages;
++
++/** Number of buffer pool pages already restored */
++extern ulint srv_lru_restore_loaded_pages;
++
++/** Number of buffer pool pages in restore list */
++extern ulint srv_lru_restore_total_pages;
++
  /** Status variables to be passed to MySQL */
  typedef struct export_var_struct export_struc;
  
-@@ -602,6 +605,16 @@
+@@ -602,6 +619,16 @@
  /*=====================*/
  	void*	arg);	/*!< in: a dummy parameter required by
  			os_thread_create */
@@ -616,28 +836,60 @@
  /******************************************************************//**
  Outputs to a file the output of the InnoDB Monitor.
  @return FALSE if not all information printed
+@@ -683,6 +710,11 @@
+ 	ulint innodb_rows_inserted;		/*!< srv_n_rows_inserted */
+ 	ulint innodb_rows_updated;		/*!< srv_n_rows_updated */
+ 	ulint innodb_rows_deleted;		/*!< srv_n_rows_deleted */
++
++	ulint innodb_lru_restore_loaded_pages;  /*!<srv_lru_restore_loaded_pages
++						 */
++	ulint innodb_lru_restore_total_pages;   /*!<srv_lru_restore_total_pages
++						 */
+ };
+ 
+ /** The server system struct */
 diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-10-01 09:57:56.516255101 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-10-01 10:00:13.304230973 +0900
-@@ -298,6 +298,9 @@
+--- a/storage/innodb_plugin/srv/srv0srv.c	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/srv/srv0srv.c	2011-01-12 19:46:02.000000000 +0300
+@@ -298,6 +298,23 @@
  reading of a disk page */
  UNIV_INTERN ulint srv_buf_pool_reads = 0;
  
 +/** Time in seconds between automatic buffer pool dumps */
 +UNIV_INTERN uint srv_auto_lru_dump = 0;
 +
++/** Maximum number of LRU entries to restore
++Consecutive pages are merged and only count as one, so you will probably
++load more pages than this number of LRU entries. */
++UNIV_INTERN ulint srv_lru_load_max_entries = 512*1024;
++
++/** If enabled, will also dump old pages from the LRU */
++UNIV_INTERN my_bool srv_lru_dump_old_pages = FALSE;
++
++/** Number of buffer pool pages already restored */
++UNIV_INTERN ulint srv_lru_restore_loaded_pages = 0;
++
++/** Number of buffer pool pages in restore list */
++UNIV_INTERN ulint srv_lru_restore_total_pages = 0;
++
  /* structure to pass status variables to MySQL */
  UNIV_INTERN export_struc export_vars;
  
-@@ -2537,6 +2540,56 @@
- 	/* We count the number of threads in os_thread_exit(). A created
- 	thread should always use that to exit and not use return() to exit. */
- 
-+	os_thread_exit(NULL);
-+
-+	OS_THREAD_DUMMY_RETURN;
-+}
-+
+@@ -2178,6 +2195,10 @@
+ 	export_vars.innodb_rows_inserted = srv_n_rows_inserted;
+ 	export_vars.innodb_rows_updated = srv_n_rows_updated;
+ 	export_vars.innodb_rows_deleted = srv_n_rows_deleted;
++	export_vars.innodb_lru_restore_loaded_pages =
++		srv_lru_restore_loaded_pages;
++	export_vars.innodb_lru_restore_total_pages =
++		srv_lru_restore_total_pages;
+ 
+ 	mutex_exit(&srv_innodb_monitor_mutex);
+ }
+@@ -2542,6 +2563,60 @@
+ 	OS_THREAD_DUMMY_RETURN;
+ }
+ 
 +/*********************************************************************//**
 +A thread which restores the buffer pool from a dump file on startup and does
 +periodic buffer pool dumps.
@@ -662,10 +914,14 @@
 +	if (srv_auto_lru_dump)
 +		buf_LRU_file_restore();
 +
++	if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
++		goto exit_func;
++	}
++
 +	last_dump_time = time(NULL);
 +
 +loop:
-+	os_thread_sleep(5000000);
++	os_thread_sleep(1000000);
 +
 +	if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
 +		goto exit_func;
@@ -683,12 +939,17 @@
 +	/* We count the number of threads in os_thread_exit(). A created
 +	thread should always use that to exit and not use return() to exit. */
 +
- 	os_thread_exit(NULL);
- 
- 	OS_THREAD_DUMMY_RETURN;
++	os_thread_exit(NULL);
++
++	OS_THREAD_DUMMY_RETURN;
++}
++
+ /*******************************************************************//**
+ Tells the InnoDB server that there has been activity in the database
+ and wakes up the master thread if it is suspended (not sleeping). Used
 diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-10-01 09:57:56.420229366 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-10-01 10:00:13.309260428 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c	2011-01-11 19:07:53.000000000 +0300
++++ b/storage/innodb_plugin/srv/srv0start.c	2011-01-12 19:46:02.000000000 +0300
 @@ -126,9 +126,9 @@
  static ulint		ios;
  
 
=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2010-12-16 11:35:26 +0000
+++ innodb_pass_corrupt_table.patch	2011-01-12 17:48:16 +0000
@@ -778,7 +778,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:38:38.249059616 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:39:02.960021471 +0900
-@@ -3716,6 +3716,12 @@
+@@ -3720,6 +3720,12 @@
  		DBUG_RETURN(1);
  	}
  
@@ -791,7 +791,7 @@
  	/* Create buffers for packing the fields of a record. Why
  	table->reclength did not work here? Obviously, because char
  	fields when packed actually became 1 byte longer, when we also
-@@ -3743,6 +3749,19 @@
+@@ -3747,6 +3753,19 @@
  	/* Get pointer to a table object in InnoDB dictionary cache */
  	ib_table = dict_table_get(norm_name, TRUE);
  	
@@ -811,7 +811,7 @@
  	if (NULL == ib_table) {
  		if (is_part && retries < 10) {
  			++retries;
-@@ -4909,6 +4928,10 @@
+@@ -4913,6 +4932,10 @@
  
  	ha_statistic_increment(&SSV::ha_write_count);
  
@@ -822,7 +822,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
  		table->timestamp_field->set_time();
  
-@@ -5126,6 +5149,10 @@
+@@ -5130,6 +5153,10 @@
  func_exit:
  	innobase_active_small();
  
@@ -833,7 +833,7 @@
  	DBUG_RETURN(error_result);
  }
  
-@@ -5302,6 +5329,10 @@
+@@ -5306,6 +5333,10 @@
  
  	ha_statistic_increment(&SSV::ha_update_count);
  
@@ -844,7 +844,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
  		table->timestamp_field->set_time();
  
-@@ -5391,6 +5422,10 @@
+@@ -5395,6 +5426,10 @@
  
  	innobase_active_small();
  
@@ -855,7 +855,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5412,6 +5447,10 @@
+@@ -5416,6 +5451,10 @@
  
  	ha_statistic_increment(&SSV::ha_delete_count);
  
@@ -866,7 +866,7 @@
  	if (!prebuilt->upd_node) {
  		row_get_prebuilt_update_vector(prebuilt);
  	}
-@@ -5438,6 +5477,10 @@
+@@ -5442,6 +5481,10 @@
  
  	innobase_active_small();
  
@@ -877,7 +877,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5677,6 +5720,10 @@
+@@ -5681,6 +5724,10 @@
  
  	ha_statistic_increment(&SSV::ha_read_key_count);
  
@@ -888,7 +888,7 @@
  	index = prebuilt->index;
  
  	if (UNIV_UNLIKELY(index == NULL)) {
-@@ -5742,6 +5789,10 @@
+@@ -5746,6 +5793,10 @@
  		ret = DB_UNSUPPORTED;
  	}
  
@@ -899,7 +899,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -5852,6 +5903,10 @@
+@@ -5856,6 +5907,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -910,7 +910,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -5942,6 +5997,10 @@
+@@ -5946,6 +6001,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -921,7 +921,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -5951,6 +6010,10 @@
+@@ -5955,6 +6014,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -932,7 +932,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7201,6 +7264,10 @@
+@@ -7205,6 +7268,10 @@
  		DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
  	}
  
@@ -943,7 +943,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7209,6 +7276,10 @@
+@@ -7213,6 +7280,10 @@
  		goto fallback;
  	}
  
@@ -954,7 +954,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -7721,6 +7792,16 @@
+@@ -7725,6 +7796,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -971,7 +971,7 @@
  /*********************************************************************//**
  Calculates the key number used inside MySQL for an Innobase index. We will
  first check the "index translation table" for a match of the index to get
-@@ -7842,7 +7923,7 @@
+@@ -7846,7 +7927,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -980,7 +980,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8133,10 +8214,18 @@
+@@ -8137,10 +8218,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -999,7 +999,7 @@
  	return(0);
  }
  
-@@ -8318,6 +8407,10 @@
+@@ -8322,6 +8411,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -1010,7 +1010,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9043,6 +9136,10 @@
+@@ -9047,6 +9140,10 @@
  
  	update_thd(thd);
  
@@ -1021,9 +1021,9 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11487,6 +11584,14 @@
-   "0 (the default) disables automatic dumps.",
-   NULL, NULL, 0, 0, UINT_MAX32, 0);
+@@ -11506,6 +11603,14 @@
+   NULL, NULL, FALSE);
+ 
  
 +static	MYSQL_SYSVAR_ULONG(pass_corrupt_table, srv_pass_corrupt_table,
 +  PLUGIN_VAR_RQCMDARG,
@@ -1036,9 +1036,9 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11572,6 +11677,7 @@
-   MYSQL_SYSVAR(io_capacity),
-   MYSQL_SYSVAR(auto_lru_dump),
+@@ -11593,6 +11698,7 @@
+   MYSQL_SYSVAR(lru_load_max_entries),
+   MYSQL_SYSVAR(lru_dump_old_pages),
    MYSQL_SYSVAR(use_purge_thread),
 +  MYSQL_SYSVAR(pass_corrupt_table),
    NULL
@@ -1343,7 +1343,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:38:38.286989546 +0900
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:39:03.048990992 +0900
-@@ -402,6 +402,7 @@
+@@ -416,6 +416,7 @@
  UNIV_INTERN ulint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
  
  UNIV_INTERN ulint	srv_expand_import = 0; /* 0:disable 1:enable */
 
=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2010-12-16 11:35:26 +0000
+++ innodb_separate_doublewrite.patch	2011-01-12 17:48:16 +0000
@@ -340,7 +340,7 @@
  
  /* Note: This variable can be set to on/off and any of the supported
  file formats in the configuration file, but can only be set to any
-@@ -2248,6 +2249,8 @@
+@@ -2252,6 +2253,8 @@
  		goto error;
  	}
  
@@ -349,7 +349,7 @@
  	srv_extra_undoslots = (ibool) innobase_extra_undoslots;
  
  	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
-@@ -11321,6 +11324,11 @@
+@@ -11325,6 +11328,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -361,7 +361,7 @@
  static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The AUTOINC lock modes supported by InnoDB:               "
-@@ -11487,6 +11495,7 @@
+@@ -11506,6 +11514,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
 
=== modified file 'innodb_show_sys_tables.patch'
--- innodb_show_sys_tables.patch	2010-12-16 11:35:26 +0000
+++ innodb_show_sys_tables.patch	2011-01-12 17:48:16 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:45:46.194411503 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:49:26.171990559 +0900
-@@ -11793,6 +11793,9 @@
+@@ -11814,6 +11814,9 @@
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
  i_s_innodb_admin_command,
@@ -29,13 +29,10 @@
  #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
  }
  
-@@ -3112,6 +3113,664 @@
- 	STRUCT_FLD(deinit, i_s_common_deinit),
- 	STRUCT_FLD(version, 0x0100 /* 1.0 */),
- 	STRUCT_FLD(status_vars, NULL),
-+	STRUCT_FLD(system_vars, NULL),
-+	STRUCT_FLD(__reserved1, NULL)
-+};
+@@ -3115,3 +3116,661 @@
+ 	STRUCT_FLD(system_vars, NULL),
+ 	STRUCT_FLD(__reserved1, NULL)
+ };
 +
 +static ST_FIELD_INFO	i_s_innodb_sys_tables_info[] =
 +{
@@ -691,9 +688,9 @@
 +	STRUCT_FLD(deinit, i_s_common_deinit),
 +	STRUCT_FLD(version, 0x0100 /* 1.0 */),
 +	STRUCT_FLD(status_vars, NULL),
- 	STRUCT_FLD(system_vars, NULL),
- 	STRUCT_FLD(__reserved1, NULL)
- };
++	STRUCT_FLD(system_vars, NULL),
++	STRUCT_FLD(__reserved1, NULL)
++};
 diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
 --- a/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:29:12.542982379 +0900
 +++ b/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:49:26.179990535 +0900
 
=== modified file 'profiling_slow.patch'
--- profiling_slow.patch	2010-12-22 20:15:33 +0000
+++ profiling_slow.patch	2011-01-12 17:48:16 +0000
@@ -95,9 +95,9 @@
 diff -ruN a/sql/log.cc b/sql/log.cc
 --- a/sql/log.cc	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/log.cc	2010-11-24 19:36:29.000000000 +0300
-@@ -2433,6 +2433,11 @@
+@@ -2434,6 +2434,11 @@
            my_b_printf(&log_file,"# No InnoDB statistics available for this query\n") == (uint) -1)
-         tmp_errno=errno;
+         tmp_errno= errno;
      }
 +
 +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
 
=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-12-22 20:15:33 +0000
+++ response-time-distribution.patch	2011-01-12 17:48:16 +0000
@@ -755,7 +755,7 @@
    case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
    case SCH_USER_PRIVILEGES:
    case SCH_SCHEMA_PRIVILEGES:
-@@ -7234,6 +7250,12 @@
+@@ -7235,6 +7251,12 @@
      init_global_index_stats();
      pthread_mutex_unlock(&LOCK_global_index_stats);
    }
 
=== modified file 'show_slave_status_nolock.patch'
--- show_slave_status_nolock.patch	2010-12-17 19:06:49 +0000
+++ show_slave_status_nolock.patch	2011-01-12 17:48:16 +0000
@@ -61,7 +61,7 @@
    sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
-@@ -2545,12 +2546,16 @@
+@@ -2546,12 +2547,16 @@
      pthread_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -79,7 +79,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2561,7 +2566,10 @@
+@@ -2562,7 +2567,10 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }
 
=== modified file 'show_temp_51.patch'
--- show_temp_51.patch	2010-12-16 11:35:26 +0000
+++ show_temp_51.patch	2011-01-12 17:48:16 +0000
@@ -50,7 +50,7 @@
    case SCH_VIEWS:
    case SCH_TRIGGERS:
    case SCH_EVENTS:
-@@ -2317,6 +2322,7 @@
+@@ -2318,6 +2323,7 @@
    }
    case SQLCOM_SHOW_DATABASES:
    case SQLCOM_SHOW_TABLES:
@@ -58,7 +58,7 @@
    case SQLCOM_SHOW_TRIGGERS:
    case SQLCOM_SHOW_TABLE_STATUS:
    case SQLCOM_SHOW_OPEN_TABLES:
-@@ -5457,6 +5463,8 @@
+@@ -5458,6 +5464,8 @@
  
    case SCH_TABLE_NAMES:
    case SCH_TABLES:
 
=== modified file 'userstat.patch'
--- userstat.patch	2011-01-04 11:30:51 +0000
+++ userstat.patch	2011-01-12 17:48:16 +0000
@@ -436,7 +436,7 @@
  
  /*
    Log slow query with all enabled log event handlers
-@@ -4495,6 +4517,8 @@
+@@ -4496,6 +4518,8 @@
                               thd->first_successful_insert_id_in_prev_stmt_for_binlog);
            if (e.write(file))
              goto err;
@@ -445,7 +445,7 @@
          }
          if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
          {
-@@ -4506,12 +4530,16 @@
+@@ -4507,12 +4531,16 @@
                               minimum());
            if (e.write(file))
              goto err;
@@ -462,7 +462,7 @@
          }
          if (thd->user_var_events.elements)
          {
-@@ -4527,6 +4555,8 @@
+@@ -4528,6 +4556,8 @@
                                   user_var_event->charset_number);
              if (e.write(file))
                goto err;
@@ -471,7 +471,7 @@
            }
          }
        }
-@@ -4539,6 +4569,8 @@
+@@ -4540,6 +4570,8 @@
      if (event_info->write(file) || 
          DBUG_EVALUATE_IF("injecting_fault_writing", 1, 0))
        goto err;
@@ -480,7 +480,7 @@
  
      if (file == &log_file) // we are writing to the real log (disk)
      {
-@@ -4684,7 +4716,7 @@
+@@ -4685,7 +4717,7 @@
      be reset as a READ_CACHE to be able to read the contents from it.
   */
  
@@ -489,7 +489,7 @@
  {
    Mutex_sentry sentry(lock_log ? &LOCK_log : NULL);
  
-@@ -4732,6 +4764,7 @@
+@@ -4733,6 +4765,7 @@
        /* write the first half of the split header */
        if (my_b_write(&log_file, header, carry))
          return ER_ERROR_ON_WRITE;
@@ -497,7 +497,7 @@
  
        /*
          copy fixed second half of header to cache so the correct
-@@ -4800,6 +4833,7 @@
+@@ -4801,6 +4834,7 @@
      /* Write data to the binary log file */
      if (my_b_write(&log_file, cache->read_pos, length))
        return ER_ERROR_ON_WRITE;
@@ -505,7 +505,7 @@
      cache->read_pos=cache->read_end;		// Mark buffer used up
    } while ((length= my_b_fill(cache)));
  
-@@ -4922,21 +4956,24 @@
+@@ -4923,21 +4957,24 @@
        */
        if (qinfo.write(&log_file))
          goto err;
@@ -984,7 +984,7 @@
    uint32     server_id;
    uint32     file_id;			// for LOAD DATA INFILE
    /* remote (peer) port */
-@@ -1828,6 +1830,8 @@
+@@ -1833,6 +1835,8 @@
    /* variables.transaction_isolation is reset to this after each commit */
    enum_tx_isolation session_tx_isolation;
    enum_check_fields count_cuted_fields;
@@ -993,7 +993,7 @@
  
    DYNAMIC_ARRAY user_var_events;        /* For user variables replication */
    MEM_ROOT      *user_var_events_alloc; /* Allocate above array elements here */
-@@ -1916,6 +1920,49 @@
+@@ -1921,6 +1925,49 @@
    */
    LOG_INFO*  current_linfo;
    NET*       slave_net;			// network connection from slave -> m.
@@ -1043,7 +1043,7 @@
    /* Used by the sys_var class to store temporary values */
    union
    {
-@@ -1981,6 +2028,11 @@
+@@ -1986,6 +2033,11 @@
      alloc_root. 
    */
    void init_for_queries();
@@ -1055,7 +1055,7 @@
    void change_user(void);
    void cleanup(void);
    void cleanup_after_query();
-@@ -2351,9 +2403,15 @@
+@@ -2356,9 +2408,15 @@
      *p_db= strmake(db, db_length);
      *p_db_length= db_length;
      return FALSE;
@@ -1071,7 +1071,7 @@
  public:
    inline Internal_error_handler *get_internal_handler()
    { return m_internal_handler; }
-@@ -2437,6 +2495,9 @@
+@@ -2442,6 +2500,9 @@
    LEX_STRING invoker_host;
  };
  
@@ -1854,7 +1854,7 @@
        my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
        DBUG_RETURN(TRUE);
      }
-@@ -5348,6 +5368,7 @@
+@@ -5349,6 +5369,7 @@
        if (!no_errors)
        {
          const char *db_name= db ? db : thd->db;
@@ -1862,7 +1862,7 @@
          my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                   sctx->priv_user, sctx->priv_host, db_name);
        }
-@@ -5380,12 +5401,15 @@
+@@ -5381,12 +5402,15 @@
    {						// We can never grant this
      DBUG_PRINT("error",("No possible access"));
      if (!no_errors)
@@ -1878,7 +1878,7 @@
      DBUG_RETURN(TRUE);				/* purecov: tested */
    }
  
-@@ -5411,11 +5435,15 @@
+@@ -5412,11 +5436,15 @@
  
    DBUG_PRINT("error",("Access denied"));
    if (!no_errors)
@@ -1894,7 +1894,7 @@
    DBUG_RETURN(TRUE);				/* purecov: tested */
  }
  
-@@ -5444,6 +5472,7 @@
+@@ -5445,6 +5473,7 @@
  
      if (!thd->col_access && check_grant_db(thd, dst_db_name))
      {
@@ -1902,7 +1902,7 @@
        my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                 thd->security_ctx->priv_user,
                 thd->security_ctx->priv_host,
-@@ -5525,9 +5554,12 @@
+@@ -5526,9 +5555,12 @@
          (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
      {
        if (!no_errors)
@@ -1915,7 +1915,7 @@
        return TRUE;
      }
      /*
-@@ -5690,6 +5722,7 @@
+@@ -5691,6 +5723,7 @@
    if ((thd->security_ctx->master_access & want_access))
      return 0;
    get_privilege_desc(command, sizeof(command), want_access);
@@ -1923,7 +1923,7 @@
    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
    return 1;
  #else
-@@ -6071,6 +6104,30 @@
+@@ -6072,6 +6105,30 @@
    lex_start(thd);
    mysql_reset_thd_for_next_command(thd);
  
@@ -1954,7 +1954,7 @@
    if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
    {
      LEX *lex= thd->lex;
-@@ -6151,6 +6208,43 @@
+@@ -6152,6 +6209,43 @@
      *found_semicolon= NULL;
    }
  
@@ -1998,7 +1998,7 @@
    DBUG_VOID_RETURN;
  }
  
-@@ -7016,6 +7110,13 @@
+@@ -7017,6 +7111,13 @@
      if (flush_error_log())
        result=1;
    }
@@ -2012,7 +2012,7 @@
  #ifdef HAVE_QUERY_CACHE
    if (options & REFRESH_QUERY_CACHE_FREE)
    {
-@@ -7116,6 +7217,40 @@
+@@ -7117,6 +7218,40 @@
  #endif
   if (options & REFRESH_USER_RESOURCES)
     reset_mqh((LEX_USER *) NULL, 0);             /* purecov: inspected */