Merge lp:~akopytov/percona-server/bug785489-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/148/

=== modified file 'patches/innodb_admin_command_base.patch'
--- patches/innodb_admin_command_base.patch	2011-09-06 08:23:51 +0000
+++ patches/innodb_admin_command_base.patch	2011-09-25 06:36:21 +0000
@@ -7,18 +7,18 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11608,6 +11608,7 @@
+@@ -11534,6 +11534,7 @@
+ i_s_innodb_cmp_reset,
+ i_s_innodb_cmpmem,
  i_s_innodb_cmpmem_reset,
- i_s_innodb_table_stats,
- i_s_innodb_index_stats,
 +i_s_innodb_admin_command,
  i_s_innodb_patches
  mysql_declare_plugin_end;
  
 --- a/storage/innodb_plugin/handler/i_s.cc
 +++ b/storage/innodb_plugin/handler/i_s.cc
-@@ -2947,3 +2947,139 @@
- 	STRUCT_FLD(system_vars, NULL),
+@@ -2602,3 +2602,139 @@
+ 	/* void* */
  	STRUCT_FLD(__reserved1, NULL)
  };
 +
@@ -159,17 +159,17 @@
 +};
 --- a/storage/innodb_plugin/handler/i_s.h
 +++ b/storage/innodb_plugin/handler/i_s.h
-@@ -40,5 +40,6 @@
+@@ -38,5 +38,6 @@
+ extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
+ extern struct st_mysql_plugin	i_s_innodb_patches;
  extern struct st_mysql_plugin	i_s_innodb_rseg;
- extern struct st_mysql_plugin	i_s_innodb_table_stats;
- extern struct st_mysql_plugin	i_s_innodb_index_stats;
 +extern struct st_mysql_plugin	i_s_innodb_admin_command;
  
  #endif /* i_s_h */
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -38,5 +38,6 @@
- {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
+@@ -37,5 +37,6 @@
+ {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
 +{"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
 
=== modified file 'patches/innodb_extend_slow.patch'
--- patches/innodb_extend_slow.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_extend_slow.patch	2011-09-25 06:36:21 +0000
@@ -374,7 +374,7 @@
  
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -1391,6 +1391,16 @@
+@@ -1390,6 +1390,16 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
  
@@ -391,7 +391,7 @@
  	DBUG_VOID_RETURN;
  }
  
-@@ -1446,6 +1456,32 @@
+@@ -1445,6 +1455,32 @@
  }
  
  
@@ -424,7 +424,7 @@
  /*********************************************************************//**
  Construct ha_innobase handler. */
  UNIV_INTERN
-@@ -9024,6 +9060,25 @@
+@@ -8975,6 +9011,25 @@
  	statement has ended */
  
  	if (trx->n_mysql_tables_in_use == 0) {
@@ -452,7 +452,7 @@
  		prebuilt->used_in_HANDLER = FALSE;
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -40,5 +40,6 @@
+@@ -39,5 +39,6 @@
  {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"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"},
@@ -802,7 +802,7 @@
  /* This is set to TRUE if the MySQL user has set it in MySQL; currently
  affects only FOREIGN KEY definition parsing */
  UNIV_INTERN ibool	srv_lower_case_table_names	= FALSE;
-@@ -1159,6 +1162,10 @@
+@@ -1156,6 +1159,10 @@
  	ibool			has_slept = FALSE;
  	srv_conc_slot_t*	slot	  = NULL;
  	ulint			i;
@@ -813,7 +813,7 @@
  
  	if (trx->mysql_thd != NULL
  	    && thd_is_replication_slave_thread(trx->mysql_thd)) {
-@@ -1235,6 +1242,7 @@
+@@ -1232,6 +1239,7 @@
  		switches. */
  		if (SRV_THREAD_SLEEP_DELAY > 0) {
  			os_thread_sleep(SRV_THREAD_SLEEP_DELAY);
@@ -821,7 +821,7 @@
  		}
  
  		trx->op_info = "";
-@@ -1290,12 +1298,25 @@
+@@ -1287,12 +1295,25 @@
  	/* Go to wait for the event; when a thread leaves InnoDB it will
  	release this thread */
  
 
=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-09-25 06:36:21 +0000
@@ -41,7 +41,7 @@
 +--file_exists $MYSQLD_DATADIR/ib_lru_dump;
 --- a/storage/innodb_plugin/buf/buf0lru.c
 +++ b/storage/innodb_plugin/buf/buf0lru.c
-@@ -2121,6 +2121,277 @@
+@@ -2121,6 +2121,282 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
  
@@ -201,6 +201,11 @@
 +			" InnoDB: cannot open %s\n", LRU_DUMP_FILE);
 +		goto end;
 +	}
++
++	ut_print_timestamp(stderr);
++	fprintf(stderr, " InnoDB: Restoring buffer pool pages from %s\n",
++		LRU_DUMP_FILE);
++
 +	if (size == 0 || size_high > 0 || size % 8) {
 +		fprintf(stderr, " InnoDB: broken LRU dump file\n");
 +		goto end;
@@ -302,7 +307,7 @@
 +
 +	ut_print_timestamp(stderr);
 +	fprintf(stderr,
-+		" InnoDB: reading pages based on the dumped LRU list was done."
++		" InnoDB: Completed reading buffer pool pages"
 +		" (requested: %lu, read: %lu)\n", req, reads);
 +	ret = TRUE;
 +end:
@@ -405,7 +410,25 @@
  Waits for an aio operation to complete. This function is used to write the
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11547,6 +11547,12 @@
+@@ -197,6 +197,8 @@
+ 
+ static char*	innodb_version_str = (char*) INNODB_VERSION_STR;
+ 
++static my_bool	innobase_blocking_lru_restore		= FALSE;
++
+ /** Possible values for system variable "innodb_stats_method". The values
+ are defined the same as its corresponding MyISAM system variable
+ "myisam_stats_method"(see "myisam_stats_method_names"), for better usability */
+@@ -2408,6 +2410,8 @@
+ 	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
+ 	srv_use_checksums = (ibool) innobase_use_checksums;
+ 
++	srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore;
++
+ #ifdef HAVE_LARGE_PAGES
+         if ((os_use_large_pages = (ibool) my_use_large_pages))
+ 		os_large_page_size = (ulint) opt_large_page_size;
+@@ -11478,6 +11482,18 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -415,28 +438,35 @@
 +  "0 (the default) disables automatic dumps.",
 +  NULL, NULL, 0, 0, UINT_MAX32, 0);
 +
++static MYSQL_SYSVAR_BOOL(blocking_lru_restore, innobase_blocking_lru_restore,
++  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
++  "Block XtraDB startup process until buffer pool is full restored from a "
++  "dump file (if present). Disabled by default.",
++  NULL, NULL, FALSE);
++
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11629,6 +11635,7 @@
+@@ -11557,6 +11573,8 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
 +  MYSQL_SYSVAR(auto_lru_dump),
++  MYSQL_SYSVAR(blocking_lru_restore),
    MYSQL_SYSVAR(use_purge_thread),
    NULL
  };
 --- a/storage/innodb_plugin/handler/i_s.cc
 +++ b/storage/innodb_plugin/handler/i_s.cc
-@@ -46,6 +46,7 @@
+@@ -45,6 +45,7 @@
+ #include "btr0btr.h" /* for btr_page_get_index_id */
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
- #include "dict0dict.h" /* for dict_sys */
 +#include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
  }
  
  static const char plugin_author[] = "Innobase Oy";
-@@ -3040,6 +3041,36 @@
+@@ -2695,6 +2696,36 @@
  			"Hello!");
  		goto end_func;
  	}
@@ -475,7 +505,7 @@
  		"Undefined XTRA_* command.");
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -41,5 +41,6 @@
+@@ -40,5 +40,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"},
  {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -562,17 +592,20 @@
  handler for completed requests. The aio array of pending requests is divided
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -335,6 +335,9 @@
+@@ -332,6 +332,12 @@
  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;
 +
++/** Whether startup should be blocked until buffer pool is fully restored */
++extern ibool srv_blocking_lru_restore;
++
  /** Status variables to be passed to MySQL */
  typedef struct export_var_struct export_struc;
  
-@@ -616,6 +619,16 @@
+@@ -613,6 +619,16 @@
  /*=====================*/
  	void*	arg);	/*!< in: a dummy parameter required by
  			os_thread_create */
@@ -591,17 +624,20 @@
  @return FALSE if not all information printed
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -303,6 +303,9 @@
+@@ -303,6 +303,12 @@
  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;
 +
++/** Whether startup should be blocked until buffer pool is fully restored */
++UNIV_INTERN ibool srv_blocking_lru_restore;
++
  /* structure to pass status variables to MySQL */
  UNIV_INTERN export_struc export_vars;
  
-@@ -2555,6 +2558,56 @@
+@@ -2552,6 +2558,58 @@
  	OS_THREAD_DUMMY_RETURN;
  }
  
@@ -626,7 +662,9 @@
 +		os_thread_pf(os_thread_get_curr_id()));
 +#endif
 +
-+	if (srv_auto_lru_dump)
++	/* If srv_blocking_lru_restore is TRUE, restore will be done
++	synchronously on startup. */
++	if (srv_auto_lru_dump && !srv_blocking_lru_restore)
 +		buf_LRU_file_restore();
 +
 +	last_dump_time = time(NULL);
@@ -660,7 +698,15 @@
  and wakes up the master thread if it is suspended (not sleeping). Used
 --- a/storage/innodb_plugin/srv/srv0start.c
 +++ b/storage/innodb_plugin/srv/srv0start.c
-@@ -126,9 +126,9 @@
+@@ -88,6 +88,7 @@
+ # include "thr0loc.h"
+ # include "os0sync.h" /* for INNODB_RW_LOCKS_USE_ATOMICS */
+ # include "zlib.h" /* for ZLIB_VERSION */
++# include "buf0lru.h" /* for buf_LRU_file_restore() */
+ 
+ /** Log sequence number immediately after startup */
+ UNIV_INTERN ib_uint64_t	srv_start_lsn;
+@@ -126,9 +127,9 @@
  static ulint		ios;
  
  /** io_handler_thread parameters for thread identification */
@@ -672,7 +718,7 @@
  
  /** We use this mutex to test the return value of pthread_mutex_trylock
     on successful locking. HP-UX does NOT return 0, though Linux et al do. */
-@@ -1706,6 +1706,10 @@
+@@ -1706,6 +1707,15 @@
  	os_thread_create(&srv_monitor_thread, NULL,
  			 thread_ids + 4 + SRV_MAX_N_IO_THREADS);
  
@@ -680,10 +726,15 @@
 +	os_thread_create(&srv_LRU_dump_restore_thread, NULL,
 +			 thread_ids + 5 + SRV_MAX_N_IO_THREADS);
 +
++	/* If srv_blocking_lru_restore is TRUE, load buffer pool contents
++	synchronously */
++	if (srv_auto_lru_dump && srv_blocking_lru_restore)
++		buf_LRU_file_restore();
++
  	srv_is_being_started = FALSE;
  
  	if (trx_doublewrite == NULL) {
-@@ -1730,13 +1734,13 @@
+@@ -1730,13 +1740,13 @@
  		ulint i;
  
  		os_thread_create(&srv_purge_thread, NULL, thread_ids
 
=== modified file 'patches/innodb_pass_corrupt_table.patch'
--- patches/innodb_pass_corrupt_table.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_pass_corrupt_table.patch	2011-09-25 06:36:21 +0000
@@ -468,7 +468,7 @@
  			goto next_loop;
  
  		cached_foreign_tables = 0;
-@@ -4657,6 +4658,12 @@
+@@ -4328,6 +4329,12 @@
  	}
  
  	do {
@@ -481,7 +481,7 @@
  		if (UNIV_LIKELY
  		    (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE
  		     || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO
-@@ -5460,4 +5467,42 @@
+@@ -5054,4 +5061,42 @@
  		rw_lock_free(&dict_table_stats_latches[i]);
  	}
  }
@@ -757,7 +757,7 @@
  	if (descr != NULL) {
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -3735,6 +3735,12 @@
+@@ -3732,6 +3732,12 @@
  		DBUG_RETURN(1);
  	}
  
@@ -770,7 +770,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
-@@ -3762,6 +3768,19 @@
+@@ -3759,6 +3765,19 @@
  	/* Get pointer to a table object in InnoDB dictionary cache */
  	ib_table = dict_table_get(norm_name, TRUE);
  	
@@ -790,7 +790,7 @@
  	if (NULL == ib_table) {
  		if (is_part && retries < 10) {
  			++retries;
-@@ -4928,6 +4947,10 @@
+@@ -4925,6 +4944,10 @@
  
  	ha_statistic_increment(&SSV::ha_write_count);
  
@@ -801,7 +801,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
  		table->timestamp_field->set_time();
  
-@@ -5145,6 +5168,10 @@
+@@ -5138,6 +5161,10 @@
  func_exit:
  	innobase_active_small();
  
@@ -812,7 +812,7 @@
  	DBUG_RETURN(error_result);
  }
  
-@@ -5321,6 +5348,10 @@
+@@ -5314,6 +5341,10 @@
  
  	ha_statistic_increment(&SSV::ha_update_count);
  
@@ -823,7 +823,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
  		table->timestamp_field->set_time();
  
-@@ -5410,6 +5441,10 @@
+@@ -5399,6 +5430,10 @@
  
  	innobase_active_small();
  
@@ -834,7 +834,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5431,6 +5466,10 @@
+@@ -5420,6 +5455,10 @@
  
  	ha_statistic_increment(&SSV::ha_delete_count);
  
@@ -845,7 +845,7 @@
  	if (!prebuilt->upd_node) {
  		row_get_prebuilt_update_vector(prebuilt);
  	}
-@@ -5457,6 +5496,10 @@
+@@ -5442,6 +5481,10 @@
  
  	innobase_active_small();
  
@@ -856,7 +856,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5696,6 +5739,10 @@
+@@ -5681,6 +5724,10 @@
  
  	ha_statistic_increment(&SSV::ha_read_key_count);
  
@@ -867,7 +867,7 @@
  	index = prebuilt->index;
  
  	if (UNIV_UNLIKELY(index == NULL)) {
-@@ -5761,6 +5808,10 @@
+@@ -5746,6 +5793,10 @@
  		ret = DB_UNSUPPORTED;
  	}
  
@@ -878,7 +878,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -5876,6 +5927,10 @@
+@@ -5856,6 +5907,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -889,7 +889,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -5966,6 +6021,10 @@
+@@ -5946,6 +6001,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -900,7 +900,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -5975,6 +6034,10 @@
+@@ -5955,6 +6014,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -911,7 +911,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7227,6 +7290,10 @@
+@@ -7202,6 +7265,10 @@
  		DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
  	}
  
@@ -922,7 +922,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7235,6 +7302,10 @@
+@@ -7210,6 +7277,10 @@
  		goto fallback;
  	}
  
@@ -933,7 +933,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -7739,6 +7810,16 @@
+@@ -7714,6 +7785,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -950,7 +950,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
-@@ -7919,7 +8000,7 @@
+@@ -7894,7 +7975,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -959,7 +959,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8209,10 +8290,18 @@
+@@ -8160,10 +8241,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -978,7 +978,7 @@
  	return(0);
  }
  
-@@ -8394,6 +8483,10 @@
+@@ -8345,6 +8434,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -989,7 +989,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9127,6 +9220,10 @@
+@@ -9078,6 +9171,10 @@
  
  	update_thd(thd);
  
@@ -1000,7 +1000,7 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11561,6 +11658,14 @@
+@@ -11492,6 +11589,14 @@
    "0 (the default) disables automatic dumps.",
    NULL, NULL, 0, 0, UINT_MAX32, 0);
  
@@ -1015,7 +1015,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11646,6 +11751,7 @@
+@@ -11574,6 +11679,7 @@
    MYSQL_SYSVAR(io_capacity),
    MYSQL_SYSVAR(auto_lru_dump),
    MYSQL_SYSVAR(use_purge_thread),
@@ -1043,7 +1043,7 @@
  	int update_row(const uchar * old_data, uchar * new_data);
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -43,5 +43,6 @@
+@@ -42,5 +42,6 @@
  {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -1117,7 +1117,7 @@
  	switch (buf_block_get_state(block)) {
 --- a/storage/innodb_plugin/include/dict0dict.h
 +++ b/storage/innodb_plugin/include/dict0dict.h
-@@ -1206,6 +1206,15 @@
+@@ -1197,6 +1197,15 @@
  dict_close(void);
  /*============*/
  
@@ -1224,7 +1224,7 @@
  Decompress a page.  This function should tolerate errors on the compressed
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -231,6 +231,7 @@
+@@ -228,6 +228,7 @@
  extern ulint	srv_adaptive_checkpoint;
  
  extern ulint	srv_expand_import;
@@ -1319,7 +1319,7 @@
  			fprintf(stderr,
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -406,6 +406,7 @@
+@@ -403,6 +403,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 'patches/innodb_purge_thread.patch'
--- patches/innodb_purge_thread.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_purge_thread.patch	2011-09-25 06:36:21 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -11060,6 +11060,11 @@
+@@ -11011,6 +11011,11 @@
    "Output statistics of recovery process after it.",
    NULL, NULL, FALSE);
  
@@ -19,7 +19,7 @@
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11571,6 +11576,7 @@
+@@ -11499,6 +11504,7 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
@@ -29,9 +29,9 @@
  
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -37,5 +37,6 @@
+@@ -36,5 +36,6 @@
+ {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
- {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
 +{"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
@@ -47,7 +47,7 @@
  extern ibool	srv_auto_extend_last_data_file;
  extern ulint	srv_last_file_size_max;
  extern char**	srv_log_group_home_dirs;
-@@ -421,6 +423,8 @@
+@@ -418,6 +420,8 @@
  	SRV_RECOVERY,	/**< threads finishing a recovery */
  	SRV_INSERT,	/**< thread flushing the insert buffer to disk */
  #endif
@@ -56,7 +56,7 @@
  	SRV_MASTER	/**< the master thread, (whose type number must
  			be biggest) */
  };
-@@ -494,6 +498,21 @@
+@@ -491,6 +495,21 @@
  /*==============*/
  	void*	arg);	/*!< in: a dummy parameter required by
  			os_thread_create */
@@ -148,7 +148,7 @@
  /* if TRUE, then we auto-extend the last data file */
  UNIV_INTERN ibool	srv_auto_extend_last_data_file	= FALSE;
  /* if != 0, this tells the max size auto-extending may increase the
-@@ -2639,10 +2641,10 @@
+@@ -2636,10 +2638,10 @@
  	srv_main_thread_process_no = os_proc_get_number();
  	srv_main_thread_id = os_thread_pf(os_thread_get_curr_id());
  
@@ -160,7 +160,7 @@
  	srv_n_threads_active[SRV_MASTER]++;
  
  	mutex_exit(&kernel_mutex);
-@@ -3100,6 +3102,7 @@
+@@ -3097,6 +3099,7 @@
  	/* Flush logs if needed */
  	srv_sync_log_buffer_in_background();
  
@@ -168,7 +168,7 @@
  	/* We run a full purge every 10 seconds, even if the server
  	were active */
  	do {
-@@ -3116,6 +3119,7 @@
+@@ -3113,6 +3116,7 @@
  		srv_sync_log_buffer_in_background();
  
  	} while (n_pages_purged);
@@ -176,7 +176,7 @@
  
  	srv_main_thread_op_info = "flushing buffer pool pages";
  
-@@ -3184,6 +3188,7 @@
+@@ -3181,6 +3185,7 @@
  		os_thread_sleep(100000);
  	}
  
@@ -184,7 +184,7 @@
  	srv_main_thread_op_info = "purging";
  
  	/* Run a full purge */
-@@ -3200,6 +3205,7 @@
+@@ -3197,6 +3202,7 @@
  		srv_sync_log_buffer_in_background();
  
  	} while (n_pages_purged);
@@ -192,7 +192,7 @@
  
  	srv_main_thread_op_info = "reserving kernel mutex";
  
-@@ -3352,3 +3358,143 @@
+@@ -3349,3 +3355,143 @@
  
  	OS_THREAD_DUMMY_RETURN;	/* Not reached, avoid compiler warning */
  }
 
=== modified file 'patches/innodb_recovery_patches.patch'
--- patches/innodb_recovery_patches.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_recovery_patches.patch	2011-09-25 06:36:21 +0000
@@ -116,7 +116,7 @@
  static my_bool	innobase_locks_unsafe_for_binlog	= FALSE;
  static my_bool	innobase_overwrite_relay_log_info	= FALSE;
  static my_bool	innobase_rollback_on_timeout		= FALSE;
-@@ -2368,6 +2370,8 @@
+@@ -2365,6 +2367,8 @@
  
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
@@ -125,7 +125,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11046,6 +11050,16 @@
+@@ -10997,6 +11001,16 @@
    "don't use the datafile for normal mysqld or ibbackup! ####",
    NULL, NULL, FALSE);
  
@@ -142,7 +142,7 @@
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11486,6 +11500,8 @@
+@@ -11417,6 +11431,8 @@
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),
    MYSQL_SYSVAR(extra_undoslots),
@@ -153,10 +153,10 @@
    MYSQL_SYSVAR(read_io_threads),
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -36,5 +36,6 @@
+@@ -35,5 +35,6 @@
+ {"innodb_expand_import","convert .ibd file automatically when import tablespace","the files are generated by xtrabackup export mode.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
- {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
 +{"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
 
=== modified file 'patches/innodb_separate_doublewrite.patch'
--- patches/innodb_separate_doublewrite.patch	2011-09-06 08:23:51 +0000
+++ patches/innodb_separate_doublewrite.patch	2011-09-25 06:36:21 +0000
@@ -341,7 +341,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
-@@ -2267,6 +2268,8 @@
+@@ -2266,6 +2267,8 @@
  		goto error;
  	}
  
@@ -349,8 +349,8 @@
 +
  	srv_extra_undoslots = (ibool) innobase_extra_undoslots;
  
- 	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
-@@ -11388,6 +11391,11 @@
+ 	/* -------------- Log files ---------------------------*/
+@@ -11319,6 +11322,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -362,7 +362,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:               "
-@@ -11561,6 +11569,7 @@
+@@ -11492,6 +11500,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
@@ -372,7 +372,7 @@
    MYSQL_SYSVAR(extra_undoslots),
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -42,5 +42,6 @@
+@@ -41,5 +41,6 @@
  {"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -515,7 +515,7 @@
  UNIV_INLINE
 --- a/storage/innodb_plugin/row/row0mysql.c
 +++ b/storage/innodb_plugin/row/row0mysql.c
-@@ -3401,7 +3401,7 @@
+@@ -3331,7 +3331,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
  
 
=== modified file 'patches/innodb_show_lock_name.patch'
--- patches/innodb_show_lock_name.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_show_lock_name.patch	2011-09-25 06:36:21 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -9317,8 +9317,8 @@
+@@ -9268,8 +9268,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
  #else /* UNIV_DEBUG */
@@ -18,7 +18,7 @@
  		buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
  				     (ulong) mutex->count_os_wait);
  
-@@ -9333,9 +9333,8 @@
+@@ -9284,9 +9284,8 @@
  
  	if (block_mutex) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -30,7 +30,7 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_mutex_oswait_count);
-@@ -9364,8 +9363,8 @@
+@@ -9315,8 +9314,8 @@
  			continue;
  		}
  
@@ -41,7 +41,7 @@
  		buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
  				      (ulong) lock->count_os_wait);
  
-@@ -9379,9 +9378,8 @@
+@@ -9330,9 +9329,8 @@
  
  	if (block_lock) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -55,7 +55,7 @@
  					     (ulong) block_lock_oswait_count);
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -39,5 +39,6 @@
+@@ -38,5 +38,6 @@
  {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
 
=== modified file 'patches/innodb_stats.patch'
--- patches/innodb_stats.patch	2011-08-09 13:35:34 +0000
+++ patches/innodb_stats.patch	2011-09-25 06:36:21 +0000
@@ -347,7 +347,7 @@
  not of the right form.
 --- a/storage/innodb_plugin/dict/dict0dict.c
 +++ b/storage/innodb_plugin/dict/dict0dict.c
-@@ -739,7 +739,7 @@
+@@ -740,7 +740,7 @@
  		print an error message and return without doing
  		anything. */
  		dict_update_statistics(table, TRUE /* only update stats
@@ -356,7 +356,7 @@
  	}
  
  	return(table);
-@@ -4282,6 +4282,313 @@
+@@ -4283,6 +4283,313 @@
  }
  
  /*********************************************************************//**
@@ -670,7 +670,7 @@
  Calculates new estimates for table and index statistics. The statistics
  are used in query optimization. */
  UNIV_INTERN
-@@ -4289,10 +4596,11 @@
+@@ -4290,10 +4597,11 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -683,7 +683,7 @@
  {
  	dict_index_t*	index;
  	ulint		sum_of_index_sizes	= 0;
-@@ -4309,6 +4617,27 @@
+@@ -4310,6 +4618,27 @@
  		return;
  	}
  
@@ -711,7 +711,7 @@
  	/* Find out the sizes of the indexes and how many different values
  	for the key they approximately have */
  
-@@ -4373,6 +4702,11 @@
+@@ -4380,6 +4709,11 @@
  		index = dict_table_get_next_index(index);
  	} while (index);
  
@@ -723,7 +723,7 @@
  	index = dict_table_get_first_index(table);
  
  	table->stat_n_rows = index->stat_n_diff_key_vals[
-@@ -4390,6 +4724,78 @@
+@@ -4397,6 +4731,78 @@
  	dict_table_stats_unlock(table, RW_X_LATCH);
  }
  
@@ -802,7 +802,7 @@
  /**********************************************************************//**
  Prints info of a foreign key constraint. */
  static
-@@ -4467,7 +4873,7 @@
+@@ -4474,7 +4880,7 @@
  
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -813,7 +813,7 @@
  
 --- a/storage/innodb_plugin/dict/dict0load.c
 +++ b/storage/innodb_plugin/dict/dict0load.c
-@@ -223,7 +223,7 @@
+@@ -224,7 +224,7 @@
  
  			if (dict_table_get_first_index(table)) {
  				dict_update_statistics(table, FALSE /* update
@@ -824,7 +824,7 @@
  			dict_table_print_low(table);
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -190,6 +190,7 @@
+@@ -193,6 +193,7 @@
  static my_bool	innobase_rollback_on_timeout		= FALSE;
  static my_bool	innobase_create_status_file		= FALSE;
  static my_bool	innobase_stats_on_metadata		= TRUE;
@@ -832,7 +832,7 @@
  
  static char*	internal_innobase_data_file_path	= NULL;
  
-@@ -2230,6 +2231,8 @@
+@@ -2271,6 +2272,8 @@
  
  	srv_extra_undoslots = (ibool) innobase_extra_undoslots;
  
@@ -841,7 +841,7 @@
  	/* -------------- Log files ---------------------------*/
  
  	/* The default dir for log files is the datadir of MySQL */
-@@ -5000,6 +5003,10 @@
+@@ -5066,6 +5069,10 @@
  
  	error = row_insert_for_mysql((byte*) record, prebuilt);
  
@@ -852,7 +852,7 @@
  	/* Handle duplicate key errors */
  	if (auto_inc_used) {
  		ulint		err;
-@@ -5336,6 +5343,10 @@
+@@ -5410,6 +5417,10 @@
  		}
  	}
  
@@ -863,7 +863,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(error,
-@@ -5389,6 +5400,10 @@
+@@ -5471,6 +5482,10 @@
  
  	error = row_update_for_mysql((byte*) record, prebuilt);
  
@@ -874,7 +874,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(
-@@ -5707,6 +5722,11 @@
+@@ -5801,6 +5816,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -886,7 +886,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_KEY_NOT_FOUND;
-@@ -5916,6 +5936,11 @@
+@@ -6022,6 +6042,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -898,7 +898,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_END_OF_FILE;
-@@ -7855,11 +7880,35 @@
+@@ -7979,11 +8004,35 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
@@ -935,7 +935,7 @@
  
  			prebuilt->trx->op_info = "returning various info to MySQL";
  		}
-@@ -7937,7 +7986,7 @@
+@@ -8061,7 +8110,7 @@
  		are asked by MySQL to avoid locking. Another reason to
  		avoid the call is that it uses quite a lot of CPU.
  		See Bug#38185. */
@@ -944,7 +944,7 @@
  			/* We do not update delete_length if no
  			locking is requested so the "old" value can
  			remain. delete_length is initialized to 0 in
-@@ -11122,6 +11171,26 @@
+@@ -11294,6 +11343,26 @@
    "The number of index pages to sample when calculating statistics (default 8)",
    NULL, NULL, 8, 1, ~0ULL, 0);
  
@@ -971,7 +971,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
    PLUGIN_VAR_OPCMDARG,
    "Enable InnoDB adaptive hash index (enabled by default).  "
-@@ -11447,6 +11516,9 @@
+@@ -11641,6 +11710,9 @@
    MYSQL_SYSVAR(overwrite_relay_log_info),
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
@@ -981,15 +981,15 @@
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
    MYSQL_SYSVAR(stats_method),
-@@ -11512,6 +11584,8 @@
+@@ -11709,6 +11781,8 @@
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,
  i_s_innodb_cmpmem_reset,
 +i_s_innodb_table_stats,
 +i_s_innodb_index_stats,
+ i_s_innodb_admin_command,
  i_s_innodb_patches
  mysql_declare_plugin_end;
- 
 --- a/storage/innodb_plugin/handler/i_s.cc
 +++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -45,6 +45,7 @@
@@ -997,11 +997,11 @@
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
 +#include "dict0dict.h" /* for dict_sys */
+ #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
  }
  
- static const char plugin_author[] = "Innobase Oy";
-@@ -2602,3 +2603,347 @@
- 	/* void* */
+@@ -2769,3 +2770,347 @@
+ 	STRUCT_FLD(system_vars, NULL),
  	STRUCT_FLD(__reserved1, NULL)
  };
 +
@@ -1350,23 +1350,25 @@
 +};
 --- a/storage/innodb_plugin/handler/i_s.h
 +++ b/storage/innodb_plugin/handler/i_s.h
-@@ -38,5 +38,7 @@
+@@ -38,6 +38,8 @@
  extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
  extern struct st_mysql_plugin	i_s_innodb_patches;
  extern struct st_mysql_plugin	i_s_innodb_rseg;
 +extern struct st_mysql_plugin	i_s_innodb_table_stats;
 +extern struct st_mysql_plugin	i_s_innodb_index_stats;
+ extern struct st_mysql_plugin	i_s_innodb_admin_command;
  
  #endif /* i_s_h */
 --- a/storage/innodb_plugin/handler/innodb_patch_info.h
 +++ b/storage/innodb_plugin/handler/innodb_patch_info.h
-@@ -35,5 +35,6 @@
+@@ -35,6 +35,7 @@
  {"innodb_expand_import","convert .ibd file automatically when import tablespace","the files are generated by xtrabackup export mode.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
 +{"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
- {NULL, NULL, NULL, NULL}
- };
+ {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
+ {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
+ {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
 --- a/storage/innodb_plugin/include/dict0boot.h
 +++ b/storage/innodb_plugin/include/dict0boot.h
 @@ -101,6 +101,7 @@
@@ -1531,7 +1533,7 @@
  should be called after the indexes for a table have been created.
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -197,6 +197,9 @@
+@@ -206,6 +206,9 @@
  extern ibool	srv_innodb_status;
  
  extern unsigned long long	srv_stats_sample_pages;
@@ -1585,7 +1587,7 @@
  	} else {
 --- a/storage/innodb_plugin/row/row0ins.c
 +++ b/storage/innodb_plugin/row/row0ins.c
-@@ -2020,6 +2020,8 @@
+@@ -2026,6 +2026,8 @@
  	}
  
  #ifdef UNIV_DEBUG
@@ -1596,7 +1598,7 @@
  		rec_t*	first_rec = page_rec_get_next(
 --- a/storage/innodb_plugin/row/row0merge.c
 +++ b/storage/innodb_plugin/row/row0merge.c
-@@ -2021,6 +2021,8 @@
+@@ -2028,6 +2028,8 @@
  		"UPDATE SYS_INDEXES SET NAME=CONCAT('"
  		TEMP_INDEX_PREFIX_STR "', NAME) WHERE ID = :indexid;\n"
  		"COMMIT WORK;\n"
@@ -1784,7 +1786,7 @@
  		dfield = dtuple_get_nth_field(entry, i);
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -369,6 +369,9 @@
+@@ -381,6 +381,9 @@
  /* When estimating number of different key values in an index, sample
  this many index pages */
  UNIV_INTERN unsigned long long	srv_stats_sample_pages = 8;
 
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-09-12 12:25:39 +0000
+++ patches/mysql-test.diff	2011-09-25 06:36:21 +0000
@@ -4093,6 +4093,7 @@
 +INNODB_AUTOEXTEND_INCREMENT
 +INNODB_AUTOINC_LOCK_MODE
 +INNODB_AUTO_LRU_DUMP
++INNODB_BLOCKING_LRU_RESTORE
 +INNODB_BUFFER_POOL_SHM_CHECKSUM
 +INNODB_BUFFER_POOL_SHM_KEY
 +INNODB_BUFFER_POOL_SIZE
@@ -4441,6 +4442,7 @@
 +INNODB_AUTOEXTEND_INCREMENT
 +INNODB_AUTOINC_LOCK_MODE
 +INNODB_AUTO_LRU_DUMP
++INNODB_BLOCKING_LRU_RESTORE
 +INNODB_BUFFER_POOL_SHM_CHECKSUM
 +INNODB_BUFFER_POOL_SHM_KEY
 +INNODB_BUFFER_POOL_SIZE
 
=== modified file 'patches/series'
--- patches/series	2011-09-06 08:23:51 +0000
+++ patches/series	2011-09-25 06:36:21 +0000
@@ -20,7 +20,6 @@
 innodb_dict_size_limit.patch
 innodb_split_buf_pool_mutex.patch
 innodb_expand_import.patch
-innodb_stats.patch
 innodb_recovery_patches.patch
 innodb_purge_thread.patch
 innodb_admin_command_base.patch
@@ -29,6 +28,7 @@
 innodb_lru_dump_restore.patch
 innodb_separate_doublewrite.patch
 innodb_pass_corrupt_table.patch
+innodb_stats.patch
 innodb_fast_checksum.patch
 innodb_files_extend.patch
 innodb_show_sys_tables.patch