Merge lp:~percona-dev/percona-server/5.5.14-porting-other into lp:percona-server/5.5

[Oleg Tsarev]

    1) port all other patches to 5.5.14
    2) sql_connect.cc little changed, I fix patches depended from it (slow_extended.patch, userstat.patch)
    3) handler.h: handler->add_index has now asynchronous, I add final_add_index call (innodb_expand_fast_index_creation.patch)
http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/65/
Nothing new errors in results.
Will fix available fails in other MP

=== modified file 'Makefile'
--- Makefile	2011-06-28 06:56:52 +0000
+++ Makefile	2011-08-01 03:32:34 +0000
@@ -1,6 +1,6 @@
 FETCH_CMD=wget
 MASTER_SITE=http://www.percona.com/downloads/community
-MYSQL_VERSION=5.5.13
+MYSQL_VERSION=5.5.14
 PERCONA_SERVER_VERSION=rel20.4
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)

=== modified file 'control_online_alter_index.patch'
--- control_online_alter_index.patch	2011-06-10 10:07:06 +0000
+++ control_online_alter_index.patch	2011-08-01 03:32:34 +0000
@@ -32,7 +32,7 @@
 diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
 --- a/sql/sql_partition.cc	2010-11-03 07:01:14.000000000 +0900
 +++ b/sql/sql_partition.cc	2010-12-03 13:59:56.444039002 +0900
-@@ -4636,7 +4636,12 @@
+@@ -4637,7 +4637,12 @@
          alter_info->num_parts= curr_part_no - new_part_no;
        }
      }
@@ -49,7 +49,7 @@
 diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
 --- a/sql/sql_table.cc	2010-11-03 07:01:14.000000000 +0900
 +++ b/sql/sql_table.cc	2010-12-03 13:51:04.768955495 +0900
-@@ -6112,6 +6112,10 @@
+@@ -6116,6 +6116,10 @@
      uint  *idx_end_p;
  
      alter_flags= table->file->alter_table_flags(alter_info->flags);

=== modified file 'innodb_adaptive_hash_index_partitions.patch'
--- innodb_adaptive_hash_index_partitions.patch	2011-06-27 07:12:14 +0000
+++ innodb_adaptive_hash_index_partitions.patch	2011-08-01 03:32:34 +0000
@@ -972,7 +972,7 @@
  
  	block->is_hashed = FALSE;
  
-@@ -1481,7 +1482,7 @@
+@@ -1413,7 +1414,7 @@
  			/* To follow the latching order, we
  			have to release btr_search_latch
  			before acquiring block->latch. */
@@ -981,7 +981,7 @@
  			/* When we release the search latch,
  			we must rescan all blocks, because
  			some may become hashed again. */
-@@ -1512,11 +1513,11 @@
+@@ -1444,11 +1445,11 @@
  			anything.  block->is_hashed can only
  			be set on uncompressed file pages. */
  
@@ -995,7 +995,7 @@
  
  			ut_ad(!btr_search_enabled);
  		}
-@@ -1535,7 +1536,11 @@
+@@ -1467,7 +1468,11 @@
  	ibool		released_search_latch;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -1008,7 +1008,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  	ut_ad(!btr_search_enabled);
  
-@@ -2655,6 +2660,7 @@
+@@ -2203,6 +2208,7 @@
  {
  	block->check_index_page_at_flush = FALSE;
  	block->index		= NULL;
@@ -1019,7 +1019,36 @@
 diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
 --- a/storage/innobase/buf/buf0lru.c	2010-12-04 15:35:29.137347521 +0900
 +++ b/storage/innobase/buf/buf0lru.c	2010-12-04 16:12:48.658550840 +0900
-@@ -1798,7 +1798,7 @@
+@@ -605,7 +605,7 @@
+ 
+ 		mutex_exit(&buf_pool->LRU_list_mutex);
+ 
+-		rw_lock_s_lock(&btr_search_latch);
++		btr_search_s_lock_all();
+ 		chunk = buf_pool->chunks;
+ 		for (j = buf_pool->n_chunks; j--; chunk++) {
+ 			buf_block_t*	block	= chunk->blocks;
+@@ -617,16 +617,16 @@
+ 					continue;
+ 				}
+ 
+-				rw_lock_s_unlock(&btr_search_latch);
++				btr_search_s_unlock_all();
+ 
+ 				rw_lock_x_lock(&block->lock);
+ 				btr_search_drop_page_hash_index(block, NULL);
+ 				rw_lock_x_unlock(&block->lock);
+ 
+-				rw_lock_s_lock(&btr_search_latch);
++				btr_search_s_lock_all();
+ 			}
+ 		}
+-		rw_lock_s_unlock(&btr_search_latch);
++		btr_search_s_unlock_all();
+ 	}
+ }
+ 
+@@ -1787,7 +1787,7 @@
  
  		UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,
  			       UNIV_PAGE_SIZE);
@@ -1031,7 +1060,7 @@
 diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
 --- a/storage/innobase/dict/dict0dict.c	2010-12-04 15:52:23.398513916 +0900
 +++ b/storage/innobase/dict/dict0dict.c	2010-12-04 16:12:48.662550715 +0900
-@@ -1811,7 +1811,7 @@
+@@ -1845,7 +1845,7 @@
  	zero. */
  
  	for (;;) {
@@ -1056,7 +1085,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:20.185850734 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:48.674552412 +0900
-@@ -11702,6 +11702,11 @@
+@@ -11719,6 +11719,11 @@
    "Disable with --skip-innodb-adaptive-hash-index.",
    NULL, innodb_adaptive_hash_index_update, TRUE);
  
@@ -1068,7 +1097,7 @@
  static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
    PLUGIN_VAR_RQCMDARG,
    "Replication thread delay (ms) on the slave server if "
-@@ -12068,6 +12073,7 @@
+@@ -12086,6 +12091,7 @@
    MYSQL_SYSVAR(use_sys_stats_table),
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
@@ -1264,7 +1293,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-15 19:00:07.713604580 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-15 20:58:03.546839883 +0900
-@@ -1546,7 +1546,7 @@
+@@ -1543,7 +1543,7 @@
  					pointers in the adaptive hash index
  					pointing to this frame */
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -1273,7 +1302,7 @@
  					already been built on this
  					page; note that it does not
  					guarantee that the index is
-@@ -1560,6 +1560,7 @@
+@@ -1557,6 +1557,7 @@
  	unsigned	curr_left_side:1;/*!< TRUE or FALSE in hash indexing */
  	dict_index_t*	index;		/*!< Index for which the adaptive
  					hash index has been created. */
@@ -1329,7 +1358,7 @@
 diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
 --- a/storage/innobase/row/row0sel.c	2010-12-04 16:09:53.204513572 +0900
 +++ b/storage/innobase/row/row0sel.c	2010-12-04 16:12:48.722551273 +0900
-@@ -1210,7 +1210,7 @@
+@@ -1211,7 +1211,7 @@
  	ut_ad(plan->unique_search);
  	ut_ad(!plan->must_get_clust);
  #ifdef UNIV_SYNC_DEBUG
@@ -1338,7 +1367,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  
  	row_sel_open_pcur(plan, TRUE, mtr);
-@@ -1381,10 +1381,10 @@
+@@ -1382,10 +1382,10 @@
  	    && !plan->must_get_clust
  	    && !plan->table->big_rows) {
  		if (!search_latch_locked) {
@@ -1351,7 +1380,7 @@
  
  			/* There is an x-latch request waiting: release the
  			s-latch for a moment; as an s-latch here is often
-@@ -1393,8 +1393,8 @@
+@@ -1394,8 +1394,8 @@
  			from acquiring an s-latch for a long time, lowering
  			performance significantly in multiprocessors. */
  
@@ -1362,7 +1391,7 @@
  		}
  
  		found_flag = row_sel_try_search_shortcut(node, plan, &mtr);
-@@ -1417,7 +1417,7 @@
+@@ -1418,7 +1418,7 @@
  	}
  
  	if (search_latch_locked) {
@@ -1371,7 +1400,7 @@
  
  		search_latch_locked = FALSE;
  	}
-@@ -1993,7 +1993,7 @@
+@@ -1994,7 +1994,7 @@
  
  func_exit:
  	if (search_latch_locked) {
@@ -1380,7 +1409,7 @@
  	}
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-@@ -3356,6 +3356,8 @@
+@@ -3357,6 +3357,8 @@
  	/* if the returned record was locked and we did a semi-consistent
  	read (fetch the newest committed version), then this is set to
  	TRUE */
@@ -1389,7 +1418,7 @@
  #ifdef UNIV_SEARCH_DEBUG
  	ulint		cnt				= 0;
  #endif /* UNIV_SEARCH_DEBUG */
-@@ -3446,18 +3448,33 @@
+@@ -3447,18 +3449,33 @@
  	/* PHASE 0: Release a possible s-latch we are holding on the
  	adaptive hash index latch if there is someone waiting behind */
  
@@ -1427,7 +1456,7 @@
  	}
  
  	/* Reset the new record lock info if srv_locks_unsafe_for_binlog
-@@ -3608,9 +3625,28 @@
+@@ -3609,9 +3626,28 @@
  			hash index semaphore! */
  
  #ifndef UNIV_SEARCH_DEBUG
@@ -1459,7 +1488,7 @@
  			}
  #endif
  			switch (row_sel_try_search_shortcut_for_mysql(
-@@ -3671,7 +3707,11 @@
+@@ -3672,7 +3708,11 @@
  
  					trx->search_latch_timeout--;
  
@@ -1472,7 +1501,7 @@
  					trx->has_search_latch = FALSE;
  				}
  
-@@ -3695,7 +3735,12 @@
+@@ -3696,7 +3736,12 @@
  	/* PHASE 3: Open or restore index cursor position */
  
  	if (trx->has_search_latch) {

=== modified file 'innodb_admin_command_base.patch'
--- innodb_admin_command_base.patch	2011-06-10 10:07:06 +0000
+++ innodb_admin_command_base.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:32:15.624039043 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:32:35.424957827 +0900
-@@ -11863,7 +11863,8 @@
+@@ -11881,7 +11881,8 @@
  i_s_innodb_sys_foreign_cols,
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,

=== modified file 'innodb_buffer_pool_pages_i_s.patch'
--- innodb_buffer_pool_pages_i_s.patch	2011-06-27 07:12:14 +0000
+++ innodb_buffer_pool_pages_i_s.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
 --- a/storage/innobase/buf/buf0buf.c	2010-12-04 20:20:44.595483291 +0900
 +++ b/storage/innobase/buf/buf0buf.c	2010-12-06 19:28:04.055227506 +0900
-@@ -4560,6 +4560,36 @@
+@@ -4159,6 +4159,36 @@
  	mutex_exit(block_mutex);
  }
  
@@ -48,7 +48,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 20:20:44.614551139 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-06 19:23:47.622195800 +0900
-@@ -12148,6 +12148,9 @@
+@@ -12166,6 +12166,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -786,7 +786,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-04 19:46:40.197471531 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-06 19:23:47.638195824 +0900
-@@ -1144,6 +1144,14 @@
+@@ -1141,6 +1141,14 @@
  /*===========*/
  	const buf_pool_t*	buf_pool)	/*!< in: buffer pool */
  	__attribute__((nonnull, const));

=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2011-06-23 07:32:16 +0000
+++ innodb_buffer_pool_shm.patch	2011-08-01 03:32:34 +0000
@@ -35,16 +35,16 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2011-04-09 18:48:47.000000000 +0400
 +++ b/storage/innobase/handler/ha_innodb.cc	2011-04-09 18:48:48.000000000 +0400
-@@ -194,6 +194,8 @@
- static my_bool	innobase_create_status_file		= FALSE;
+@@ -195,6 +195,8 @@
  static my_bool	innobase_stats_on_metadata		= TRUE;
+ static my_bool	innobase_large_prefix			= FALSE;
  static my_bool	innobase_use_sys_stats_table		= FALSE;
 +static my_bool	innobase_buffer_pool_shm_checksum	= TRUE;
 +static uint	innobase_buffer_pool_shm_key		= 0;
  
  
  static char*	internal_innobase_data_file_path	= NULL;
-@@ -2670,6 +2672,12 @@
+@@ -2676,6 +2678,12 @@
  	srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
  	srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
  
@@ -57,7 +57,7 @@
  	srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
  
  	srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11733,6 +11741,16 @@
+@@ -11750,6 +11758,16 @@
    "Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
    NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
  
@@ -74,7 +74,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -12027,6 +12045,8 @@
+@@ -12044,6 +12062,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),

=== modified file 'innodb_bug60788.patch'
--- innodb_bug60788.patch	2011-06-29 09:32:51 +0000
+++ innodb_bug60788.patch	2011-08-01 03:32:34 +0000
@@ -10,7 +10,7 @@
 diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
 --- a/storage/innobase/os/os0file.c	2011-04-20 12:09:57.000000000 +0400
 +++ b/storage/innobase/os/os0file.c	2011-04-20 12:10:04.000000000 +0400
-@@ -2092,6 +2092,9 @@
+@@ -2093,6 +2093,9 @@
  			failures++;
  
  			retry = TRUE;
@@ -20,7 +20,7 @@
  		} else {
  
  			retry = FALSE;
-@@ -2222,6 +2225,7 @@
+@@ -2223,6 +2226,7 @@
  	off_t	offs;
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
  	ssize_t	n_bytes;
@@ -28,7 +28,7 @@
  #endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */
  	ulint		sec;
  	ulint		ms;
-@@ -2262,7 +2266,18 @@
+@@ -2263,7 +2267,18 @@
  	os_n_pending_reads++;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -48,7 +48,7 @@
  
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_preads--;
-@@ -2281,6 +2296,7 @@
+@@ -2282,6 +2297,7 @@
  	{
  		off_t	ret_offset;
  		ssize_t	ret;
@@ -56,7 +56,7 @@
  #ifndef UNIV_HOTBACKUP
  		ulint	i;
  #endif /* !UNIV_HOTBACKUP */
-@@ -2301,7 +2317,17 @@
+@@ -2302,7 +2318,17 @@
  		if (ret_offset < 0) {
  			ret = -1;
  		} else {
@@ -75,7 +75,7 @@
  		}
  
  #ifndef UNIV_HOTBACKUP
-@@ -2340,6 +2366,7 @@
+@@ -2341,6 +2367,7 @@
  				offset */
  {
  	ssize_t	ret;
@@ -83,7 +83,7 @@
  	off_t	offs;
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
-@@ -2367,7 +2394,18 @@
+@@ -2368,7 +2395,18 @@
  	os_n_pending_writes++;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -103,7 +103,7 @@
  
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_pwrites--;
-@@ -2414,7 +2452,17 @@
+@@ -2415,7 +2453,17 @@
  			goto func_exit;
  		}
  

=== modified file 'innodb_deadlock_count.patch'
--- innodb_deadlock_count.patch	2011-06-10 10:07:06 +0000
+++ innodb_deadlock_count.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:09:53.145500265 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:10:24.605515894 +0900
-@@ -686,6 +686,8 @@
+@@ -687,6 +687,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,		  SHOW_LONG},
@@ -42,7 +42,7 @@
 diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
 --- a/storage/innobase/lock/lock0lock.c	2010-12-03 17:49:11.609953956 +0900
 +++ b/storage/innobase/lock/lock0lock.c	2010-12-04 16:10:24.608513889 +0900
-@@ -3328,6 +3328,7 @@
+@@ -3330,6 +3330,7 @@
  		break;
  
  	case LOCK_VICTIM_IS_START:

=== modified file 'innodb_dict_size_limit.patch'
--- innodb_dict_size_limit.patch	2011-06-10 10:07:06 +0000
+++ innodb_dict_size_limit.patch	2011-08-01 03:32:34 +0000
@@ -252,7 +252,7 @@
 diff -ruN a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
 --- a/storage/innobase/dict/dict0crea.c	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/dict/dict0crea.c	2010-12-03 15:45:47.521955810 +0900
-@@ -1210,6 +1210,9 @@
+@@ -1209,6 +1209,9 @@
  		/* Foreign constraint system tables have already been
  		created, and they are ok */
  
@@ -262,7 +262,7 @@
  		mutex_exit(&(dict_sys->mutex));
  
  		return(DB_SUCCESS);
-@@ -1291,6 +1294,11 @@
+@@ -1290,6 +1293,11 @@
  
  	trx_commit_for_mysql(trx);
  
@@ -360,7 +360,7 @@
  /****************************************************************//**
  If the given column name is reserved for InnoDB system columns, return
  TRUE.
-@@ -1728,6 +1790,11 @@
+@@ -1762,6 +1824,11 @@
  	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -375,7 +375,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:43:57.294986852 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:45:47.534959966 +0900
-@@ -674,6 +674,8 @@
+@@ -675,6 +675,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,		  SHOW_LONG},
@@ -384,7 +384,7 @@
    {"have_atomic_builtins",
    (char*) &export_vars.innodb_have_atomic_builtins,	  SHOW_BOOL},
    {"log_waits",
-@@ -11642,6 +11644,11 @@
+@@ -11659,6 +11661,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -396,7 +396,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11709,6 +11716,7 @@
+@@ -11727,6 +11734,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),
@@ -435,7 +435,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2011-02-01 18:00:03.000000000 +0900
 +++ b/storage/innobase/include/buf0buf.h	2011-02-01 18:03:29.000000000 +0900
-@@ -1555,6 +1555,15 @@
+@@ -1558,6 +1558,15 @@
  #define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
  /* @} */
  
@@ -454,7 +454,7 @@
 diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
 --- a/storage/innobase/include/dict0dict.h	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/include/dict0dict.h	2010-12-03 15:45:47.558024515 +0900
-@@ -1170,6 +1170,12 @@
+@@ -1183,6 +1183,12 @@
  /*====================================*/
  	dict_table_t*	table,	/*!< in: table */
  	const char*	name);	/*!< in: name of the index to find */

=== modified file 'innodb_expand_fast_index_creation.patch'
--- innodb_expand_fast_index_creation.patch	2011-05-11 13:27:33 +0000
+++ innodb_expand_fast_index_creation.patch	2011-08-01 03:32:34 +0000
@@ -219,7 +219,7 @@
 +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 +
 +######################################
-+DROP TABLE t1;
++DROP t1;
 +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
 +INSERT INTO t2 VALUES (0), (1), (2);
 +CREATE TABLE t1 (
@@ -301,7 +301,7 @@
 diff -ruN a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
 --- a/mysql-test/suite/innodb/t/innodb-index.test	2011-03-31 17:36:17.000000000 +0400
 +++ b/mysql-test/suite/innodb/t/innodb-index.test	2011-04-11 08:57:21.000000000 +0400
-@@ -28,6 +28,11 @@
+@@ -87,6 +87,11 @@
  show create table t1;
  --error ER_MULTIPLE_PRI_KEY
  alter table t1 add primary key (c);
@@ -419,7 +419,7 @@
 diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
 --- a/sql/sql_lex.h	2011-04-11 08:57:19.000000000 +0400
 +++ b/sql/sql_lex.h	2011-04-11 08:57:21.000000000 +0400
-@@ -1003,6 +1003,9 @@
+@@ -1009,6 +1009,9 @@
    List<Alter_column>            alter_list;
    List<Key>                     key_list;
    List<Create_field>            create_list;
@@ -429,7 +429,7 @@
    uint                          flags;
    enum enum_enable_or_disable   keys_onoff;
    enum tablespace_op_type       tablespace_op;
-@@ -1014,6 +1017,8 @@
+@@ -1020,6 +1023,8 @@
  
  
    Alter_info() :
@@ -438,7 +438,7 @@
      flags(0),
      keys_onoff(LEAVE_AS_IS),
      tablespace_op(NO_TABLESPACE_OP),
-@@ -1029,6 +1034,9 @@
+@@ -1035,6 +1040,9 @@
      alter_list.empty();
      key_list.empty();
      create_list.empty();
@@ -451,7 +451,7 @@
 diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
 --- a/sql/sql_table.cc	2011-04-11 08:56:57.000000000 +0400
 +++ b/sql/sql_table.cc	2011-04-11 23:30:02.000000000 +0400
-@@ -2773,7 +2773,7 @@
+@@ -2774,7 +2774,7 @@
        file                      The handler for the new table.
        key_info_buffer     OUT   An array of KEY structs for the indexes.
        key_count           OUT   The number of elements in the array.
@@ -460,7 +460,7 @@
  
    DESCRIPTION
      Prepares the table and key structures for table creation.
-@@ -3119,7 +3119,6 @@
+@@ -3120,7 +3120,6 @@
    }
  
    /* Create keys */
@@ -468,7 +468,7 @@
    List_iterator<Key> key_iterator(alter_info->key_list);
    List_iterator<Key> key_iterator2(alter_info->key_list);
    uint key_parts=0, fk_key_count=0;
-@@ -3217,6 +3216,14 @@
+@@ -3218,6 +3217,14 @@
    if (!*key_info_buffer || ! key_part_info)
      DBUG_RETURN(TRUE);				// Out of memory
  
@@ -483,7 +483,7 @@
    key_iterator.rewind();
    key_number=0;
    for (; (key=key_iterator++) ; key_number++)
-@@ -3635,6 +3642,22 @@
+@@ -3636,6 +3643,22 @@
        key_info->comment.str= key->key_create_info.comment.str;
      }
  
@@ -506,7 +506,7 @@
      key_info++;
    }
    if (!unique_key && !primary_key &&
-@@ -5247,6 +5270,10 @@
+@@ -5249,6 +5272,10 @@
    List<Create_field> new_create_list;
    /* New key definitions are added here */
    List<Key> new_key_list;
@@ -517,7 +517,7 @@
    List_iterator<Alter_drop> drop_it(alter_info->drop_list);
    List_iterator<Create_field> def_it(alter_info->create_list);
    List_iterator<Alter_column> alter_it(alter_info->alter_list);
-@@ -5259,6 +5286,7 @@
+@@ -5261,6 +5288,7 @@
    uint used_fields= create_info->used_fields;
    KEY *key_info=table->key_info;
    bool rc= TRUE;
@@ -525,7 +525,7 @@
  
    DBUG_ENTER("mysql_prepare_alter_table");
  
-@@ -5431,7 +5459,23 @@
+@@ -5433,7 +5461,23 @@
    /*
      Collect all keys which isn't in drop list. Add only those
      for which some fields exists.
@@ -550,7 +550,7 @@
  
    for (uint i=0 ; i < table->s->keys ; i++,key_info++)
    {
-@@ -5548,6 +5592,8 @@
+@@ -5550,6 +5594,8 @@
                     test(key_info->flags & HA_GENERATED_KEY),
                     key_parts);
        new_key_list.push_back(key);
@@ -559,7 +559,7 @@
      }
    }
    {
-@@ -5555,7 +5601,21 @@
+@@ -5557,7 +5603,21 @@
      while ((key=key_it++))			// Add new keys
      {
        if (key->type != Key::FOREIGN_KEY)
@@ -581,7 +581,7 @@
        if (key->name.str &&
  	  !my_strcasecmp(system_charset_info, key->name.str, primary_key_name))
        {
-@@ -5604,12 +5664,100 @@
+@@ -5606,12 +5666,101 @@
    rc= FALSE;
    alter_info->create_list.swap(new_create_list);
    alter_info->key_list.swap(new_key_list);
@@ -659,9 +659,9 @@
 +    for (key_part= key->key_part; key_part < part_end; key_part++)
 +      key_part->field= table->field[key_part->fieldnr];
 +  }
-+
++  handler_add_index *add= 0;
 +  if ((error= table->file->add_index(table, alter_info->delayed_key_info,
-+                                     alter_info->delayed_key_count)))
++                                     alter_info->delayed_key_count, &add)))
 +  {
 +    /*
 +      Exchange the key_info for the error message. If we exchange
@@ -674,6 +674,7 @@
 +
 +    DBUG_RETURN(error);
 +  }
++  table->file->final_add_index(add, true);
 +
 +  DBUG_RETURN(0);
 +}
@@ -682,7 +683,7 @@
    Alter table
  
    SYNOPSIS
-@@ -6400,19 +6548,38 @@
+@@ -6404,19 +6552,38 @@
    */
    if (new_table && !(new_table->file->ha_table_flags() & HA_NO_COPY_ON_ALTER))
    {

=== modified file 'innodb_expand_import.patch'
--- innodb_expand_import.patch	2011-06-10 10:07:06 +0000
+++ innodb_expand_import.patch	2011-08-01 03:32:34 +0000
@@ -53,7 +53,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "buf0lru.h"
  # include "ibuf0ibuf.h"
-@@ -3032,6 +3040,84 @@
+@@ -3033,6 +3041,84 @@
  }
  
  /********************************************************************//**
@@ -138,7 +138,7 @@
  Tries to open a single-table tablespace and optionally checks the space id is
  right in it. If does not succeed, prints an error message to the .err log. This
  function is used to open a tablespace when we start up mysqld, and also in
-@@ -3078,7 +3164,7 @@
+@@ -3079,7 +3165,7 @@
  
  	file = os_file_create_simple_no_error_handling(
  		innodb_file_data_key, filepath, OS_FILE_OPEN,
@@ -147,7 +147,7 @@
  	if (!success) {
  		/* The following call prints an error message */
  		os_file_get_last_error(TRUE);
-@@ -3125,6 +3211,445 @@
+@@ -3126,6 +3212,445 @@
  	space_id = fsp_header_get_space_id(page);
  	space_flags = fsp_header_get_flags(page);
  
@@ -593,7 +593,7 @@
  	ut_free(buf2);
  
  	if (UNIV_UNLIKELY(space_id != id
-@@ -3166,6 +3691,271 @@
+@@ -3167,6 +3692,271 @@
  	os_file_close(file);
  	mem_free(filepath);
  
@@ -868,7 +868,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:49:59.195023983 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:52:23.555957062 +0900
-@@ -7377,6 +7377,14 @@
+@@ -7389,6 +7389,14 @@
  		err = row_discard_tablespace_for_mysql(dict_table->name, trx);
  	} else {
  		err = row_import_tablespace_for_mysql(dict_table->name, trx);
@@ -883,7 +883,7 @@
  	}
  
  	err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
-@@ -11649,6 +11657,11 @@
+@@ -11666,6 +11674,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -895,7 +895,7 @@
  static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
    PLUGIN_VAR_RQCMDARG,
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
-@@ -11721,6 +11734,7 @@
+@@ -11739,6 +11752,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),
@@ -1033,7 +1033,7 @@
 diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
 --- a/storage/innobase/row/row0mysql.c	2011-04-11 19:44:03.000000000 +0900
 +++ b/storage/innobase/row/row0mysql.c	2011-06-06 11:53:18.395764565 +0900
-@@ -2568,6 +2568,11 @@
+@@ -2573,6 +2573,11 @@
  
  	current_lsn = log_get_lsn();
  
@@ -1045,7 +1045,7 @@
  	/* It is possible, though very improbable, that the lsn's in the
  	tablespace to be imported have risen above the current system lsn, if
  	a lengthy purge, ibuf merge, or rollback was performed on a backup
-@@ -2679,6 +2684,11 @@
+@@ -2684,6 +2689,11 @@
  
  	trx->op_info = "";
  

=== modified file 'innodb_extend_slow.patch'
--- innodb_extend_slow.patch	2011-06-29 09:32:51 +0000
+++ innodb_extend_slow.patch	2011-08-01 03:32:34 +0000
@@ -114,7 +114,7 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
  	ut_ad(mtr);
-@@ -2875,6 +2935,9 @@
+@@ -2876,6 +2936,9 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
@@ -124,7 +124,7 @@
  	buf_pool->stat.n_page_gets++;
  	fold = buf_page_address_fold(space, offset);
  loop:
-@@ -2949,7 +3012,7 @@
+@@ -2950,7 +3013,7 @@
  			return(NULL);
  		}
  
@@ -335,7 +335,7 @@
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2010-12-03 15:53:54.610037199 +0900
 +++ b/storage/innobase/fil/fil0fil.c	2010-12-03 17:42:42.079064198 +0900
-@@ -4747,7 +4747,7 @@
+@@ -4748,7 +4748,7 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
  				 page_size * n_pages,
@@ -344,7 +344,7 @@
  #endif
  		if (success) {
  			node->size += n_pages;
-@@ -5074,7 +5074,7 @@
+@@ -5075,7 +5075,7 @@
  i/o on a tablespace which does not exist */
  UNIV_INTERN
  ulint
@@ -353,7 +353,7 @@
  /*===*/
  	ulint	type,		/*!< in: OS_FILE_READ or OS_FILE_WRITE,
  				ORed to OS_FILE_LOG, if a log i/o
-@@ -5099,8 +5099,9 @@
+@@ -5100,8 +5100,9 @@
  	void*	buf,		/*!< in/out: buffer where to store read data
  				or from where to write; in aio this must be
  				appropriately aligned */
@@ -364,7 +364,7 @@
  {
  	ulint		mode;
  	fil_space_t*	space;
-@@ -5268,7 +5269,7 @@
+@@ -5269,7 +5270,7 @@
  #else
  	/* Queue the aio request */
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
@@ -376,7 +376,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:36:44.293955189 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:42:42.090024586 +0900
-@@ -1573,6 +1573,16 @@
+@@ -1579,6 +1579,16 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
  
@@ -393,7 +393,7 @@
  	DBUG_VOID_RETURN;
  }
  
-@@ -1627,6 +1637,32 @@
+@@ -1633,6 +1643,32 @@
  	return(trx);
  }
  
@@ -426,7 +426,7 @@
  /*********************************************************************//**
  Note that a transaction has been registered with MySQL.
  @return true if transaction is registered with MySQL 2PC coordinator */
-@@ -9301,6 +9337,25 @@
+@@ -9313,6 +9349,25 @@
  	statement has ended */
  
  	if (trx->n_mysql_tables_in_use == 0) {
@@ -675,7 +675,7 @@
 diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
 --- a/storage/innobase/lock/lock0lock.c	2010-12-03 15:09:51.297986437 +0900
 +++ b/storage/innobase/lock/lock0lock.c	2010-12-03 17:42:42.111024587 +0900
-@@ -1755,6 +1755,8 @@
+@@ -1765,6 +1765,8 @@
  {
  	lock_t*	lock;
  	trx_t*	trx;
@@ -684,7 +684,7 @@
  
  	ut_ad(mutex_own(&kernel_mutex));
  
-@@ -1813,6 +1815,10 @@
+@@ -1823,6 +1825,10 @@
  	trx->que_state = TRX_QUE_LOCK_WAIT;
  	trx->was_chosen_as_deadlock_victim = FALSE;
  	trx->wait_started = time(NULL);
@@ -695,7 +695,7 @@
  
  	ut_a(que_thr_stop(thr));
  
-@@ -3764,6 +3770,8 @@
+@@ -3766,6 +3772,8 @@
  {
  	lock_t*	lock;
  	trx_t*	trx;
@@ -704,7 +704,7 @@
  
  	ut_ad(mutex_own(&kernel_mutex));
  
-@@ -3819,6 +3827,10 @@
+@@ -3821,6 +3829,10 @@
  		return(DB_SUCCESS);
  	}
  
@@ -727,7 +727,7 @@
  #include "log0recv.h"
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
-@@ -2212,13 +2214,18 @@
+@@ -2213,13 +2215,18 @@
  	ulint		n,	/*!< in: number of bytes to read */
  	ulint		offset,	/*!< in: least significant 32 bits of file
  				offset from where to read */
@@ -747,7 +747,7 @@
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  
-@@ -2239,6 +2246,15 @@
+@@ -2240,6 +2247,15 @@
  
  	os_n_file_reads++;
  
@@ -763,7 +763,7 @@
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_preads++;
-@@ -2252,6 +2268,13 @@
+@@ -2253,6 +2269,13 @@
  	os_n_pending_reads--;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -777,7 +777,7 @@
  	return(n_bytes);
  #else
  	{
-@@ -2288,6 +2311,13 @@
+@@ -2289,6 +2312,13 @@
  		os_n_pending_reads--;
  		os_mutex_exit(os_file_count_mutex);
  
@@ -791,7 +791,7 @@
  		return(ret);
  	}
  #endif
-@@ -2428,7 +2458,8 @@
+@@ -2429,7 +2459,8 @@
  				offset where to read */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -801,7 +801,7 @@
  {
  #ifdef __WIN__
  	BOOL		ret;
-@@ -2503,7 +2534,7 @@
+@@ -2504,7 +2535,7 @@
  	os_bytes_read_since_printout += n;
  
  try_again:
@@ -810,7 +810,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -2632,7 +2663,7 @@
+@@ -2633,7 +2664,7 @@
  	os_bytes_read_since_printout += n;
  
  try_again:
@@ -819,7 +819,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -4026,10 +4057,11 @@
+@@ -4027,10 +4058,11 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -832,18 +832,16 @@
  {
  	os_aio_array_t*	array;
  	os_aio_slot_t*	slot;
-@@ -4070,8 +4102,8 @@
- 		wait in the Windows case. */
+@@ -4078,7 +4110,7 @@
  
  		if (type == OS_FILE_READ) {
--			return(os_file_read(file, buf, offset,
+ 			return(os_file_read_func(file, buf, offset,
 -					    offset_high, n));
-+			return(os_file_read_trx(file, buf, offset,
 +					    offset_high, n, trx));
  		}
  
  		ut_a(type == OS_FILE_WRITE);
-@@ -4111,6 +4143,11 @@
+@@ -4119,6 +4151,11 @@
  		array = NULL; /* Eliminate compiler warning */
  	}
  
@@ -901,7 +899,7 @@
 +
  	trx->op_info = "waiting in InnoDB queue";
  
- 	thd_wait_begin(trx->mysql_thd, THD_WAIT_ROW_TABLE_LOCK);
+ 	thd_wait_begin(trx->mysql_thd, THD_WAIT_USER_LOCK);
 @@ -1379,6 +1395,12 @@
  
  	trx->op_info = "";

=== modified file 'innodb_extra_rseg.patch'
--- innodb_extra_rseg.patch	2011-06-10 10:07:06 +0000
+++ innodb_extra_rseg.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:18:48.879955903 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:22:53.779955671 +0900
-@@ -11528,6 +11528,7 @@
+@@ -11546,6 +11546,7 @@
    innobase_system_variables, /* system variables */
    NULL /* reserved */
  },

=== modified file 'innodb_fake_changes.patch'
--- innodb_fake_changes.patch	2011-07-06 11:02:28 +0000
+++ innodb_fake_changes.patch	2011-08-01 03:32:34 +0000
@@ -1,5 +1,5 @@
 # name       : innodb_fake_changes.patch
-# introduced : 5.5.13
+# introduced : 5.5.14
 # maintainer : Yasufumi
 #
 #!!! notice !!!
@@ -182,20 +182,20 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2011-06-01 21:04:26.511385596 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2011-06-01 21:04:53.723390828 +0900
-@@ -485,6 +485,12 @@
+@@ -486,6 +486,12 @@
    " or 2 (write at commit, flush once per second).",
    NULL, NULL, 1, 0, 2, 0);
  
 +static MYSQL_THDVAR_BOOL(fake_changes, PLUGIN_VAR_OPCMDARG,
 +  "In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records "
 +  "and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. "
-+  "ATTENTION: the transaction started after enabled is affected.",
++  "This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.",
 +  NULL, NULL, FALSE);
 +
  
  static handler *innobase_create_handler(handlerton *hton,
                                          TABLE_SHARE *table,
-@@ -1676,6 +1682,8 @@
+@@ -1682,6 +1688,8 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
  
@@ -204,7 +204,7 @@
  #ifdef EXTENDED_SLOWLOG
  	if (thd_log_slow_verbosity(thd) & SLOG_V_INNODB) {
  		trx->take_stats = TRUE;
-@@ -3152,6 +3160,11 @@
+@@ -3164,6 +3172,11 @@
  		trx_search_latch_release_if_reserved(trx);
  	}
  
@@ -216,7 +216,7 @@
  	/* Transaction is deregistered only in a commit or a rollback. If
  	it is deregistered we know there cannot be resources to be freed
  	and we could return immediately.  For the time being, we play safe
-@@ -7491,6 +7504,12 @@
+@@ -7507,6 +7520,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -229,7 +229,7 @@
  	/* Latch the InnoDB data dictionary exclusively so that no deadlocks
  	or lock waits can happen in it during a table create operation.
  	Drop table etc. do this latching in row0mysql.c. */
-@@ -7711,6 +7730,10 @@
+@@ -7727,6 +7746,10 @@
  		DBUG_RETURN(HA_ERR_CRASHED);
  	}
  
@@ -240,7 +240,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7767,6 +7790,12 @@
+@@ -7783,6 +7806,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -253,7 +253,7 @@
  	name_len = strlen(name);
  
  	ut_a(name_len < 1000);
-@@ -7853,6 +7882,12 @@
+@@ -7869,6 +7898,12 @@
  	trx->mysql_thd = NULL;
  #else
  	trx = innobase_trx_allocate(thd);
@@ -266,7 +266,7 @@
  #endif
  	row_drop_database_for_mysql(namebuf, trx);
  	my_free(namebuf);
-@@ -7958,6 +7993,11 @@
+@@ -7974,6 +8009,11 @@
  	trx_search_latch_release_if_reserved(parent_trx);
  
  	trx = innobase_trx_allocate(thd);
@@ -278,7 +278,7 @@
  
  	error = innobase_rename_table(trx, from, to, TRUE);
  
-@@ -10756,6 +10796,10 @@
+@@ -10772,6 +10812,10 @@
  		return(0);
  	}
  
@@ -289,7 +289,7 @@
  	thd_get_xid(thd, (MYSQL_XID*) &trx->xid);
  
  	/* Release a possible FIFO ticket and search latch. Since we will
-@@ -12226,6 +12270,7 @@
+@@ -12300,6 +12344,7 @@
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
    MYSQL_SYSVAR(lazy_drop_table),
@@ -300,7 +300,7 @@
 diff -ruN a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
 --- a/storage/innobase/handler/handler0alter.cc	2011-04-11 19:44:03.000000000 +0900
 +++ b/storage/innobase/handler/handler0alter.cc	2011-06-01 21:04:53.728495636 +0900
-@@ -657,6 +657,10 @@
+@@ -695,6 +695,10 @@
  	possible adaptive hash latch to avoid deadlocks of threads. */
  	trx_search_latch_release_if_reserved(prebuilt->trx);
  
@@ -311,7 +311,7 @@
  	/* Check if the index name is reserved. */
  	if (innobase_index_name_is_reserved(user_thd, key_info, num_of_keys)) {
  		DBUG_RETURN(-1);
-@@ -682,6 +686,13 @@
+@@ -732,6 +736,13 @@
  	/* Create a background transaction for the operations on
  	the data dictionary tables. */
  	trx = innobase_trx_allocate(user_thd);
@@ -325,7 +325,18 @@
  	trx_start_if_not_started(trx);
  
  	/* Create table containing all indexes to be built in this
-@@ -1172,6 +1183,12 @@
+@@ -1092,6 +1103,10 @@
+ 	trx_search_latch_release_if_reserved(prebuilt->trx);
+ 	trx = prebuilt->trx;
+ 
++	if (trx->fake_changes) {
++		DBUG_RETURN(HA_ERR_WRONG_COMMAND);
++	}
++
+ 	/* Test and mark all the indexes to be dropped */
+ 
+ 	row_mysql_lock_data_dictionary(trx);
+@@ -1296,6 +1311,12 @@
  	/* Create a background transaction for the operations on
  	the data dictionary tables. */
  	trx = innobase_trx_allocate(user_thd);
@@ -364,7 +375,7 @@
 diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
 --- a/storage/innobase/lock/lock0lock.c	2011-06-01 21:04:26.543396960 +0900
 +++ b/storage/innobase/lock/lock0lock.c	2011-06-01 21:04:53.739416526 +0900
-@@ -3909,6 +3909,10 @@
+@@ -3912,6 +3912,10 @@
  
  	trx = thr_get_trx(thr);
  
@@ -375,7 +386,7 @@
  	lock_mutex_enter_kernel();
  
  	/* Look for stronger locks the same trx already has on the table */
-@@ -5107,6 +5111,11 @@
+@@ -5114,6 +5118,11 @@
  	}
  
  	trx = thr_get_trx(thr);
@@ -387,7 +398,7 @@
  	next_rec = page_rec_get_next_const(rec);
  	next_rec_heap_no = page_rec_get_heap_no(next_rec);
  
-@@ -5275,6 +5284,10 @@
+@@ -5282,6 +5291,10 @@
  		return(DB_SUCCESS);
  	}
  
@@ -398,7 +409,7 @@
  	heap_no = rec_offs_comp(offsets)
  		? rec_get_heap_no_new(rec)
  		: rec_get_heap_no_old(rec);
-@@ -5333,6 +5346,10 @@
+@@ -5340,6 +5353,10 @@
  		return(DB_SUCCESS);
  	}
  
@@ -409,7 +420,7 @@
  	heap_no = page_rec_get_heap_no(rec);
  
  	/* Another transaction cannot have an implicit lock on the record,
-@@ -5420,6 +5437,10 @@
+@@ -5427,6 +5444,10 @@
  		return(DB_SUCCESS);
  	}
  
@@ -420,7 +431,7 @@
  	heap_no = page_rec_get_heap_no(rec);
  
  	lock_mutex_enter_kernel();
-@@ -5496,6 +5517,10 @@
+@@ -5503,6 +5524,10 @@
  		return(DB_SUCCESS);
  	}
  

=== modified file 'innodb_fast_checksum.patch'
--- innodb_fast_checksum.patch	2011-06-10 10:07:06 +0000
+++ innodb_fast_checksum.patch	2011-08-01 03:32:34 +0000
@@ -109,7 +109,7 @@
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2010-12-04 15:52:23.406513743 +0900
 +++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:53:45.020513800 +0900
-@@ -3094,13 +3094,24 @@
+@@ -3095,13 +3095,24 @@
  		return(TRUE);
  	}
  
@@ -135,7 +135,7 @@
  	return(FALSE);
  }
  
-@@ -3116,7 +3127,9 @@
+@@ -3117,7 +3128,9 @@
  	if (!zip_size) {
  		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,
  				srv_use_checksums
@@ -157,7 +157,7 @@
  static my_bool	innobase_recovery_stats			= TRUE;
  static my_bool	innobase_locks_unsafe_for_binlog	= FALSE;
  static my_bool	innobase_overwrite_relay_log_info	= FALSE;
-@@ -2620,6 +2621,7 @@
+@@ -2626,6 +2627,7 @@
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
@@ -165,7 +165,7 @@
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11421,6 +11423,15 @@
+@@ -11433,6 +11435,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -181,7 +181,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11930,6 +11941,7 @@
+@@ -11947,6 +11958,7 @@
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
    MYSQL_SYSVAR(checksums),
@@ -192,7 +192,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-04 15:52:23.458514045 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:53:45.044514150 +0900
-@@ -604,6 +604,11 @@
+@@ -607,6 +607,11 @@
  buf_calc_page_new_checksum(
  /*=======================*/
  	const byte*	page);	/*!< in: buffer page */

=== modified file 'innodb_files_extend.patch'
--- innodb_files_extend.patch	2011-06-10 10:07:06 +0000
+++ innodb_files_extend.patch	2011-08-01 03:32:34 +0000
@@ -17,7 +17,7 @@
  			fprintf(stderr,
  				"InnoDB: Error: the size of single-table"
  				" tablespace file %s\n"
-@@ -4151,7 +4151,7 @@
+@@ -4152,7 +4152,7 @@
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
  #ifndef UNIV_HOTBACKUP
@@ -26,7 +26,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
  			" file %s\n"
-@@ -4171,7 +4171,7 @@
+@@ -4172,7 +4172,7 @@
  	/* Align the memory for file i/o if we might have O_DIRECT set */
  	page = ut_align(buf2, UNIV_PAGE_SIZE);
  
@@ -35,7 +35,7 @@
  		success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE);
  
  		/* We have to read the tablespace id from the file */
-@@ -5149,9 +5149,9 @@
+@@ -5150,9 +5150,9 @@
  	ut_ad(ut_is_2pow(zip_size));
  	ut_ad(buf);
  	ut_ad(len > 0);
@@ -112,7 +112,7 @@
  static my_bool innobase_thread_concurrency_timer_based;
  static long long innobase_buffer_pool_size, innobase_log_file_size;
  
-@@ -2316,6 +2319,65 @@
+@@ -2322,6 +2325,65 @@
  	}
  #endif /* DBUG_OFF */
  
@@ -178,7 +178,7 @@
  #ifndef MYSQL_SERVER
  	innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7241,9 +7303,9 @@
+@@ -7253,9 +7315,9 @@
  				| DICT_TF_COMPACT
  				| DICT_TF_FORMAT_ZIP
  				<< DICT_TF_FORMAT_SHIFT;
@@ -191,7 +191,7 @@
  		}
  	}
  
-@@ -11432,6 +11494,16 @@
+@@ -11444,6 +11506,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -208,7 +208,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11936,6 +12008,8 @@
+@@ -11953,6 +12025,8 @@
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {
@@ -220,7 +220,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-04 15:55:21.375482937 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:55:58.258469088 +0900
-@@ -1683,7 +1683,7 @@
+@@ -1686,7 +1686,7 @@
  	time_t		last_printout_time;
  					/*!< when buf_print_io was last time
  					called */
@@ -229,7 +229,7 @@
  					/*!< Statistics of buddy system,
  					indexed by block size */
  	buf_pool_stat_t	stat;		/*!< current statistics */
-@@ -1779,7 +1779,7 @@
+@@ -1782,7 +1782,7 @@
  	/* @{ */
  	UT_LIST_BASE_NODE_T(buf_page_t)	zip_clean;
  					/*!< unmodified compressed pages */
@@ -238,7 +238,7 @@
  					/*!< buddy free lists */
  
  	buf_page_t			watch[BUF_POOL_WATCH_SIZE];
-@@ -1787,9 +1787,9 @@
+@@ -1790,9 +1790,9 @@
  					pool watches. Protected by
  				       	buf_pool->mutex. */
  

=== modified file 'innodb_fix_misc.patch'
--- innodb_fix_misc.patch	2011-06-29 09:32:51 +0000
+++ innodb_fix_misc.patch	2011-08-01 03:32:34 +0000
@@ -5,15 +5,639 @@
 # Bug fix for
 # http://bugs.mysql.com/56433 (always: because good for all users, and safe)
 # and http://bugs.mysql.com/51325 (optional: innodb_lazy_drop_table)
+# and http://bugs.mysql.com/61341 (needed for innodb_lazy_drop_table to remove buf_LRU_insert_zip_clean())
 # were added. They may be removed in the future when will be fixed officially.
 #
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
+diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
+--- a/storage/innobase/buf/buf0buddy.c	2011-07-05 15:15:38.473447294 +0900
++++ b/storage/innobase/buf/buf0buddy.c	2011-07-05 15:16:09.258444327 +0900
+@@ -378,7 +378,6 @@
+ 	buf_page_t*	bpage,	/*!< in: block to relocate */
+ 	buf_page_t*	dpage)	/*!< in: free block to relocate to */
+ {
+-	buf_page_t*	b;
+ 	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
+ 
+ 	//ut_ad(buf_pool_mutex_own(buf_pool));
+@@ -421,16 +420,6 @@
+ 	buf_relocate(bpage, dpage);
+ 	ut_d(bpage->state = BUF_BLOCK_ZIP_FREE);
+ 
+-	/* relocate buf_pool->zip_clean */
+-	b = UT_LIST_GET_PREV(zip_list, dpage);
+-	UT_LIST_REMOVE(zip_list, buf_pool->zip_clean, dpage);
+-
+-	if (b) {
+-		UT_LIST_INSERT_AFTER(zip_list, buf_pool->zip_clean, b, dpage);
+-	} else {
+-		UT_LIST_ADD_FIRST(zip_list, buf_pool->zip_clean, dpage);
+-	}
+-
+ 	UNIV_MEM_INVALID(bpage, sizeof *bpage);
+ 
+ 	mutex_exit(&buf_pool->zip_mutex);
 diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
 --- a/storage/innobase/buf/buf0buf.c	2011-02-23 19:00:48.178696354 +0900
 +++ b/storage/innobase/buf/buf0buf.c	2011-02-23 19:01:19.138826278 +0900
-@@ -4084,6 +4084,7 @@
+@@ -1189,72 +1189,6 @@
+ 	return(NULL);
+ }
+ 
+-/*********************************************************************//**
+-Checks that all blocks in the buffer chunk are in BUF_BLOCK_NOT_USED state.
+-@return	TRUE if all freed */
+-static
+-ibool
+-buf_chunk_all_free(
+-/*===============*/
+-	const buf_chunk_t*	chunk)	/*!< in: chunk being checked */
+-{
+-	const buf_block_t*	block;
+-	ulint			i;
+-
+-	block = chunk->blocks;
+-
+-	for (i = chunk->size; i--; block++) {
+-
+-		if (buf_block_get_state(block) != BUF_BLOCK_NOT_USED) {
+-
+-			return(FALSE);
+-		}
+-	}
+-
+-	return(TRUE);
+-}
+-
+-/********************************************************************//**
+-Frees a chunk of buffer frames. */
+-static
+-void
+-buf_chunk_free(
+-/*===========*/
+-	buf_pool_t*	buf_pool,	/*!< in: buffer pool instance */
+-	buf_chunk_t*	chunk)		/*!< out: chunk of buffers */
+-{
+-	buf_block_t*		block;
+-	const buf_block_t*	block_end;
+-
+-	//ut_ad(buf_pool_mutex_own(buf_pool)); /* but we need all mutex here */
+-
+-	block_end = chunk->blocks + chunk->size;
+-
+-	for (block = chunk->blocks; block < block_end; block++) {
+-		ut_a(buf_block_get_state(block) == BUF_BLOCK_NOT_USED);
+-		ut_a(!block->page.zip.data);
+-
+-		ut_ad(!block->page.in_LRU_list);
+-		ut_ad(!block->in_unzip_LRU_list);
+-		ut_ad(!block->page.in_flush_list);
+-		/* Remove the block from the free list. */
+-		mutex_enter(&buf_pool->free_list_mutex);
+-		ut_ad(block->page.in_free_list);
+-		UT_LIST_REMOVE(free, buf_pool->free, (&block->page));
+-		mutex_exit(&buf_pool->free_list_mutex);
+-
+-		/* Free the latches. */
+-		mutex_free(&block->mutex);
+-		rw_lock_free(&block->lock);
+-#ifdef UNIV_SYNC_DEBUG
+-		rw_lock_free(&block->debug_latch);
+-#endif /* UNIV_SYNC_DEBUG */
+-		UNIV_MEM_UNDESC(block);
+-	}
+-
+-	os_mem_free_large(chunk->mem, chunk->mem_size);
+-}
+-
+ /********************************************************************//**
+ Set buffer pool size variables after resizing it */
+ static
+@@ -1380,8 +1314,6 @@
+ 	chunk = chunks + buf_pool->n_chunks;
+ 
+ 	while (--chunk >= chunks) {
+-		/* Bypass the checks of buf_chunk_free(), since they
+-		would fail at shutdown. */
+ 		os_mem_free_large(chunk->mem, chunk->mem_size);
+ 	}
+ 
+@@ -1644,290 +1576,6 @@
+ 	HASH_INSERT(buf_page_t, hash, buf_pool->page_hash, fold, dpage);
+ }
+ 
+-/********************************************************************//**
+-Shrinks a buffer pool instance. */
+-static
+-void
+-buf_pool_shrink_instance(
+-/*=====================*/
+-	buf_pool_t*	buf_pool,	/*!< in: buffer pool instance */
+-	ulint		chunk_size)	/*!< in: number of pages to remove */
+-{
+-	buf_chunk_t*	chunks;
+-	buf_chunk_t*	chunk;
+-	ulint		max_size;
+-	ulint		max_free_size;
+-	buf_chunk_t*	max_chunk;
+-	buf_chunk_t*	max_free_chunk;
+-
+-	ut_ad(!buf_pool_mutex_own(buf_pool));
+-
+-try_again:
+-	btr_search_disable(); /* Empty the adaptive hash index again */
+-	//buf_pool_mutex_enter(buf_pool);
+-	mutex_enter(&buf_pool->LRU_list_mutex);
+-
+-shrink_again:
+-	if (buf_pool->n_chunks <= 1) {
+-
+-		/* Cannot shrink if there is only one chunk */
+-		goto func_done;
+-	}
+-
+-	/* Search for the largest free chunk
+-	not larger than the size difference */
+-	chunks = buf_pool->chunks;
+-	chunk = chunks + buf_pool->n_chunks;
+-	max_size = max_free_size = 0;
+-	max_chunk = max_free_chunk = NULL;
+-
+-	while (--chunk >= chunks) {
+-		if (chunk->size <= chunk_size
+-		    && chunk->size > max_free_size) {
+-			if (chunk->size > max_size) {
+-				max_size = chunk->size;
+-				max_chunk = chunk;
+-			}
+-
+-			if (buf_chunk_all_free(chunk)) {
+-				max_free_size = chunk->size;
+-				max_free_chunk = chunk;
+-			}
+-		}
+-	}
+-
+-	if (!max_free_size) {
+-
+-		ulint		dirty	= 0;
+-		ulint		nonfree	= 0;
+-		buf_block_t*	block;
+-		buf_block_t*	bend;
+-
+-		/* Cannot shrink: try again later
+-		(do not assign srv_buf_pool_old_size) */
+-		if (!max_chunk) {
+-
+-			goto func_exit;
+-		}
+-
+-		block = max_chunk->blocks;
+-		bend = block + max_chunk->size;
+-
+-		/* Move the blocks of chunk to the end of the
+-		LRU list and try to flush them. */
+-		for (; block < bend; block++) {
+-			switch (buf_block_get_state(block)) {
+-			case BUF_BLOCK_NOT_USED:
+-				continue;
+-			case BUF_BLOCK_FILE_PAGE:
+-				break;
+-			default:
+-				nonfree++;
+-				continue;
+-			}
+-
+-			mutex_enter(&block->mutex);
+-			/* The following calls will temporarily
+-			release block->mutex and buf_pool->mutex.
+-			Therefore, we have to always retry,
+-			even if !dirty && !nonfree. */
+-
+-			if (!buf_flush_ready_for_replace(&block->page)) {
+-
+-				buf_LRU_make_block_old(&block->page);
+-				dirty++;
+-			} else if (buf_LRU_free_block(&block->page, TRUE, TRUE)
+-				   != BUF_LRU_FREED) {
+-				nonfree++;
+-			}
+-
+-			mutex_exit(&block->mutex);
+-		}
+-
+-		//buf_pool_mutex_exit(buf_pool);
+-		mutex_exit(&buf_pool->LRU_list_mutex);
+-
+-		/* Request for a flush of the chunk if it helps.
+-		Do not flush if there are non-free blocks, since
+-		flushing will not make the chunk freeable. */
+-		if (nonfree) {
+-			/* Avoid busy-waiting. */
+-			os_thread_sleep(100000);
+-		} else if (dirty
+-			   && buf_flush_LRU(buf_pool, dirty)
+-			      == ULINT_UNDEFINED) {
+-
+-			buf_flush_wait_batch_end(buf_pool, BUF_FLUSH_LRU);
+-		}
+-
+-		goto try_again;
+-	}
+-
+-	max_size = max_free_size;
+-	max_chunk = max_free_chunk;
+-
+-	buf_pool->old_pool_size = buf_pool->curr_pool_size;
+-
+-	/* Rewrite buf_pool->chunks.  Copy everything but max_chunk. */
+-	chunks = mem_alloc((buf_pool->n_chunks - 1) * sizeof *chunks);
+-	memcpy(chunks, buf_pool->chunks,
+-	       (max_chunk - buf_pool->chunks) * sizeof *chunks);
+-	memcpy(chunks + (max_chunk - buf_pool->chunks),
+-	       max_chunk + 1,
+-	       buf_pool->chunks + buf_pool->n_chunks
+-	       - (max_chunk + 1));
+-	ut_a(buf_pool->curr_size > max_chunk->size);
+-	buf_pool->curr_size -= max_chunk->size;
+-	buf_pool->curr_pool_size = buf_pool->curr_size * UNIV_PAGE_SIZE;
+-	chunk_size -= max_chunk->size;
+-	buf_chunk_free(buf_pool, max_chunk);
+-	mem_free(buf_pool->chunks);
+-	buf_pool->chunks = chunks;
+-	buf_pool->n_chunks--;
+-
+-	/* Allow a slack of one megabyte. */
+-	if (chunk_size > 1048576 / UNIV_PAGE_SIZE) {
+-
+-		goto shrink_again;
+-	}
+-	goto func_exit;
+-
+-func_done:
+-	buf_pool->old_pool_size = buf_pool->curr_pool_size;
+-func_exit:
+-	//buf_pool_mutex_exit(buf_pool);
+-	mutex_exit(&buf_pool->LRU_list_mutex);
+-	btr_search_enable();
+-}
+-
+-/********************************************************************//**
+-Shrinks the buffer pool. */
+-static
+-void
+-buf_pool_shrink(
+-/*============*/
+-	ulint	chunk_size)	/*!< in: number of pages to remove */
+-{
+-	ulint	i;
+-
+-	for (i = 0; i < srv_buf_pool_instances; i++) {
+-		buf_pool_t*	buf_pool;
+-		ulint		instance_chunk_size;
+-
+-		instance_chunk_size = chunk_size / srv_buf_pool_instances;
+-		buf_pool = buf_pool_from_array(i);
+-		buf_pool_shrink_instance(buf_pool, instance_chunk_size);
+-	}
+-
+-	buf_pool_set_sizes();
+-}
+-
+-/********************************************************************//**
+-Rebuild buf_pool->page_hash for a buffer pool instance. */
+-static
+-void
+-buf_pool_page_hash_rebuild_instance(
+-/*================================*/
+-	buf_pool_t*	buf_pool)		/*!< in: buffer pool instance */
+-{
+-	ulint		i;
+-	buf_page_t*	b;
+-	buf_chunk_t*	chunk;
+-	ulint		n_chunks;
+-	hash_table_t*	zip_hash;
+-	hash_table_t*	page_hash;
+-
+-	//buf_pool_mutex_enter(buf_pool);
+-	mutex_enter(&buf_pool->LRU_list_mutex);
+-	rw_lock_x_lock(&buf_pool->page_hash_latch);
+-
+-	/* Free, create, and populate the hash table. */
+-	hash_table_free(buf_pool->page_hash);
+-	buf_pool->page_hash = page_hash = hash_create(2 * buf_pool->curr_size);
+-	zip_hash = hash_create(2 * buf_pool->curr_size);
+-
+-	HASH_MIGRATE(buf_pool->zip_hash, zip_hash, buf_page_t, hash,
+-		     BUF_POOL_ZIP_FOLD_BPAGE);
+-
+-	hash_table_free(buf_pool->zip_hash);
+-	buf_pool->zip_hash = zip_hash;
+-
+-	/* Insert the uncompressed file pages to buf_pool->page_hash. */
+-
+-	chunk = buf_pool->chunks;
+-	n_chunks = buf_pool->n_chunks;
+-
+-	for (i = 0; i < n_chunks; i++, chunk++) {
+-		ulint		j;
+-		buf_block_t*	block = chunk->blocks;
+-
+-		for (j = 0; j < chunk->size; j++, block++) {
+-			if (buf_block_get_state(block)
+-			    == BUF_BLOCK_FILE_PAGE) {
+-				ut_ad(!block->page.in_zip_hash);
+-				ut_ad(block->page.in_page_hash);
+-
+-				HASH_INSERT(buf_page_t, hash, page_hash,
+-					    buf_page_address_fold(
+-						    block->page.space,
+-						    block->page.offset),
+-					    &block->page);
+-			}
+-		}
+-	}
+-
+-	/* Insert the compressed-only pages to buf_pool->page_hash.
+-	All such blocks are either in buf_pool->zip_clean or
+-	in buf_pool->flush_list. */
+-
+-	mutex_enter(&buf_pool->zip_mutex);
+-	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
+-	     b = UT_LIST_GET_NEXT(zip_list, b)) {
+-		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
+-		ut_ad(!b->in_flush_list);
+-		ut_ad(b->in_LRU_list);
+-		ut_ad(b->in_page_hash);
+-		ut_ad(!b->in_zip_hash);
+-
+-		HASH_INSERT(buf_page_t, hash, page_hash,
+-			    buf_page_address_fold(b->space, b->offset), b);
+-	}
+-	mutex_exit(&buf_pool->zip_mutex);
+-
+-	buf_flush_list_mutex_enter(buf_pool);
+-	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
+-	     b = UT_LIST_GET_NEXT(flush_list, b)) {
+-		ut_ad(b->in_flush_list);
+-		ut_ad(b->in_LRU_list);
+-		ut_ad(b->in_page_hash);
+-		ut_ad(!b->in_zip_hash);
+-
+-		switch (buf_page_get_state(b)) {
+-		case BUF_BLOCK_ZIP_DIRTY:
+-			HASH_INSERT(buf_page_t, hash, page_hash,
+-				    buf_page_address_fold(b->space,
+-							  b->offset), b);
+-			break;
+-		case BUF_BLOCK_FILE_PAGE:
+-			/* uncompressed page */
+-			break;
+-		case BUF_BLOCK_ZIP_FREE:
+-		case BUF_BLOCK_ZIP_PAGE:
+-		case BUF_BLOCK_NOT_USED:
+-		case BUF_BLOCK_READY_FOR_USE:
+-		case BUF_BLOCK_MEMORY:
+-		case BUF_BLOCK_REMOVE_HASH:
+-			ut_error;
+-			break;
+-		}
+-	}
+-
+-	buf_flush_list_mutex_exit(buf_pool);
+-	//buf_pool_mutex_exit(buf_pool);
+-	mutex_exit(&buf_pool->LRU_list_mutex);
+-	rw_lock_x_unlock(&buf_pool->page_hash_latch);
+-}
+-
+ /********************************************************************
+ Determine if a block is a sentinel for a buffer pool watch.
+ @return	TRUE if a sentinel for a buffer pool watch, FALSE if not */
+@@ -2049,127 +1697,6 @@
+ 	return(NULL);
+ }
+ 
+-/********************************************************************//**
+-Rebuild buf_pool->page_hash. */
+-static
+-void
+-buf_pool_page_hash_rebuild(void)
+-/*============================*/
+-{
+-	ulint   i;
+-
+-	for (i = 0; i < srv_buf_pool_instances; i++) {
+-		buf_pool_page_hash_rebuild_instance(buf_pool_from_array(i));
+-	}
+-}
+-
+-/********************************************************************//**
+-Increase the buffer pool size of one buffer pool instance. */
+-static
+-void
+-buf_pool_increase_instance(
+-/*=======================*/
+-	buf_pool_t*	buf_pool,	/*!< in: buffer pool instane */
+-	ulint		change_size)	/*!< in: new size of the pool */
+-{
+-	buf_chunk_t*	chunks;
+-	buf_chunk_t*	chunk;
+-
+-	mutex_enter(&buf_pool->LRU_list_mutex);
+-	rw_lock_x_lock(&buf_pool->page_hash_latch);
+-	buf_pool_mutex_enter(buf_pool);
+-	chunks = mem_alloc((buf_pool->n_chunks + 1) * sizeof *chunks);
+-
+-	memcpy(chunks, buf_pool->chunks, buf_pool->n_chunks * sizeof *chunks);
+-
+-	chunk = &chunks[buf_pool->n_chunks];
+-
+-	if (!buf_chunk_init(buf_pool, chunk, change_size)) {
+-		mem_free(chunks);
+-	} else {
+-		buf_pool->old_pool_size = buf_pool->curr_pool_size;
+-		buf_pool->curr_size += chunk->size;
+-		buf_pool->curr_pool_size = buf_pool->curr_size * UNIV_PAGE_SIZE;
+-		mem_free(buf_pool->chunks);
+-		buf_pool->chunks = chunks;
+-		buf_pool->n_chunks++;
+-	}
+-
+-	mutex_exit(&buf_pool->LRU_list_mutex);
+-	rw_lock_x_unlock(&buf_pool->page_hash_latch);
+-	buf_pool_mutex_exit(buf_pool);
+-}
+-
+-/********************************************************************//**
+-Increase the buffer pool size. */
+-static
+-void
+-buf_pool_increase(
+-/*==============*/
+-	ulint   change_size)
+-{
+-	ulint   i;
+-
+-	for (i = 0; i < srv_buf_pool_instances; i++) {
+-		buf_pool_increase_instance(
+-			buf_pool_from_array(i),
+-			change_size / srv_buf_pool_instances);
+-	}
+-
+-	buf_pool_set_sizes();
+-}
+-
+-/********************************************************************//**
+-Resizes the buffer pool. */
+-UNIV_INTERN
+-void
+-buf_pool_resize(void)
+-/*=================*/
+-{
+-	ulint	change_size;
+-	ulint	min_change_size = 1048576 * srv_buf_pool_instances;
+-
+-	buf_pool_mutex_enter_all();
+-
+-  	if (srv_buf_pool_old_size == srv_buf_pool_size) {
+-
+-		buf_pool_mutex_exit_all();
+-
+-  		return;
+-
+-  	} else if (srv_buf_pool_curr_size + min_change_size
+-		   > srv_buf_pool_size) {
+-
+-		change_size = (srv_buf_pool_curr_size - srv_buf_pool_size)
+-			    / UNIV_PAGE_SIZE;
+-
+-		buf_pool_mutex_exit_all();
+-
+-  		/* Disable adaptive hash indexes and empty the index
+-  		in order to free up memory in the buffer pool chunks. */
+-		buf_pool_shrink(change_size);
+-
+-	} else if (srv_buf_pool_curr_size + min_change_size
+-		   < srv_buf_pool_size) {
+-
+-  		/* Enlarge the buffer pool by at least one megabyte */
+-
+-		change_size = srv_buf_pool_size - srv_buf_pool_curr_size;
+-
+-		buf_pool_mutex_exit_all();
+-
+-		buf_pool_increase(change_size);
+-	} else {
+-		srv_buf_pool_size = srv_buf_pool_old_size;
+-
+-		buf_pool_mutex_exit_all();
+-
+-		return;
+-	}
+-
+-  	buf_pool_page_hash_rebuild();
+-}
+-
+ /****************************************************************//**
+ Remove the sentinel block for the watch before replacing it with a real block.
+ buf_page_watch_clear() or buf_page_watch_occurred() will notice that
+@@ -2513,6 +2040,27 @@
+ #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
+ 	}
+ 
++	if (UNIV_UNLIKELY(bpage->space_was_being_deleted)) {
++		/* This page is obsoleted, should discard and retry */
++		rw_lock_s_unlock(&buf_pool->page_hash_latch);
++
++		mutex_enter(&buf_pool->LRU_list_mutex);
++		block_mutex = buf_page_get_mutex_enter(bpage);
++
++		if (UNIV_UNLIKELY(!block_mutex)) {
++			mutex_exit(&buf_pool->LRU_list_mutex);
++			goto lookup;
++		}
++
++		buf_LRU_free_block(bpage, TRUE, TRUE);
++
++		mutex_exit(&buf_pool->LRU_list_mutex);
++		mutex_exit(block_mutex);
++		block_mutex = NULL;
++
++		goto lookup;
++	}
++
+ 	if (UNIV_UNLIKELY(!bpage->zip.data)) {
+ 		/* There is no compressed page. */
+ err_exit:
+@@ -3026,6 +2574,27 @@
+ 		block = (buf_block_t*) buf_page_hash_get_low(
+ 			buf_pool, space, offset, fold);
+ 		if (block) {
++			if (UNIV_UNLIKELY(block->page.space_was_being_deleted)) {
++				/* This page is obsoleted, should discard and retry */
++				rw_lock_s_unlock(&buf_pool->page_hash_latch);
++
++				mutex_enter(&buf_pool->LRU_list_mutex);
++				block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
++
++				if (UNIV_UNLIKELY(!block_mutex)) {
++					mutex_exit(&buf_pool->LRU_list_mutex);
++					goto loop;
++				}
++
++				buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE);
++
++				mutex_exit(&buf_pool->LRU_list_mutex);
++				mutex_exit(block_mutex);
++				block_mutex = NULL;
++
++				goto loop;
++			}
++
+ 			block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
+ 			ut_a(block_mutex);
+ 		}
+@@ -3225,8 +2794,6 @@
+ 
+ 		if (buf_page_get_state(&block->page)
+ 		    == BUF_BLOCK_ZIP_PAGE) {
+-			UT_LIST_REMOVE(zip_list, buf_pool->zip_clean,
+-				       &block->page);
+ 			ut_ad(!block->page.in_flush_list);
+ 		} else {
+ 			/* Relocate buf_pool->flush_list. */
+@@ -3943,11 +3510,28 @@
+ 
+ 	fold = buf_page_address_fold(space, offset);
+ 
++retry:
+ 	//buf_pool_mutex_enter(buf_pool);
+ 	mutex_enter(&buf_pool->LRU_list_mutex);
+ 	rw_lock_x_lock(&buf_pool->page_hash_latch);
+ 
+ 	watch_page = buf_page_hash_get_low(buf_pool, space, offset, fold);
++
++	if (UNIV_UNLIKELY(watch_page && watch_page->space_was_being_deleted)) {
++		mutex_t*	block_mutex = buf_page_get_mutex_enter(watch_page);
++
++		/* This page is obsoleted, should discard and retry */
++		rw_lock_x_unlock(&buf_pool->page_hash_latch);
++		ut_a(block_mutex);
++
++		buf_LRU_free_block(watch_page, TRUE, TRUE);
++
++		mutex_exit(&buf_pool->LRU_list_mutex);
++		mutex_exit(block_mutex);
++
++		goto retry;
++	}
++
+ 	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
+ 		/* The page is already in the buffer pool. */
+ 		watch_page = NULL;
+@@ -4084,6 +3668,7 @@
  		bpage->state	= BUF_BLOCK_ZIP_PAGE;
  		bpage->space	= space;
  		bpage->offset	= offset;
@@ -21,6 +645,121 @@
  
  
  #ifdef UNIV_DEBUG
+@@ -4112,7 +3697,6 @@
+ 
+ 		/* The block must be put to the LRU list, to the old blocks */
+ 		buf_LRU_add_block(bpage, TRUE/* to old blocks */);
+-		buf_LRU_insert_zip_clean(bpage);
+ 
+ 		mutex_exit(&buf_pool->LRU_list_mutex);
+ 
+@@ -4167,6 +3751,7 @@
+ 
+ 	fold = buf_page_address_fold(space, offset);
+ 
++retry:
+ 	//buf_pool_mutex_enter(buf_pool);
+ 	mutex_enter(&buf_pool->LRU_list_mutex);
+ 	rw_lock_x_lock(&buf_pool->page_hash_latch);
+@@ -4174,6 +3759,21 @@
+ 	block = (buf_block_t*) buf_page_hash_get_low(
+ 		buf_pool, space, offset, fold);
+ 
++	if (UNIV_UNLIKELY(block && block->page.space_was_being_deleted)) {
++		mutex_t*	block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
++
++		/* This page is obsoleted, should discard and retry */
++		rw_lock_x_unlock(&buf_pool->page_hash_latch);
++		ut_a(block_mutex);
++
++		buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE);
++
++		mutex_exit(&buf_pool->LRU_list_mutex);
++		mutex_exit(block_mutex);
++
++		goto retry;
++	}
++
+ 	if (block
+ 	    && buf_page_in_file(&block->page)
+ 	    && !buf_pool_watch_is_sentinel(buf_pool, &block->page)) {
+@@ -4465,9 +4065,9 @@
+ 	}
+ 
+ 	if (io_type == BUF_IO_WRITE
+-	    && (buf_page_get_state(bpage) == BUF_BLOCK_ZIP_DIRTY
+-		|| buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) {
+-		/* to keep consistency at buf_LRU_insert_zip_clean() */
++	    && (/* buf_page_get_state(bpage) == BUF_BLOCK_ZIP_DIRTY
++		||*/ buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) {
++		/* (REMOVED) to keep consistency at buf_LRU_insert_zip_clean() */
+ 		have_LRU_mutex = TRUE; /* optimistic */
+ 	}
+ retry_mutex:
+@@ -4788,35 +4388,7 @@
+ 
+ 	mutex_enter(&buf_pool->zip_mutex);
+ 
+-	/* Check clean compressed-only blocks. */
+-
+-	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
+-	     b = UT_LIST_GET_NEXT(zip_list, b)) {
+-		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
+-		switch (buf_page_get_io_fix(b)) {
+-		case BUF_IO_NONE:
+-			/* All clean blocks should be I/O-unfixed. */
+-			break;
+-		case BUF_IO_READ:
+-			/* In buf_LRU_free_block(), we temporarily set
+-			b->io_fix = BUF_IO_READ for a newly allocated
+-			control block in order to prevent
+-			buf_page_get_gen() from decompressing the block. */
+-			break;
+-		default:
+-			ut_error;
+-			break;
+-		}
+-
+-		/* It is OK to read oldest_modification here because
+-		we have acquired buf_pool->zip_mutex above which acts
+-		as the 'block->mutex' for these bpages. */
+-		ut_a(!b->oldest_modification);
+-		ut_a(buf_page_hash_get(buf_pool, b->space, b->offset) == b);
+-
+-		n_lru++;
+-		n_zip++;
+-	}
++	/* Check clean compressed-only blocks. (zip_clean list was removed)*/
+ 
+ 	/* Check dirty blocks. */
+ 
+@@ -4880,7 +4452,7 @@
+ 		ut_error;
+ 	}
+ 
+-	ut_a(UT_LIST_GET_LEN(buf_pool->LRU) == n_lru);
++	//ut_a(UT_LIST_GET_LEN(buf_pool->LRU) == n_lru); /* zip_clean list was removed */
+ 	/* because of latching order with block->mutex, we cannot get needed mutexes before that */
+ /*
+ 	if (UT_LIST_GET_LEN(buf_pool->free) != n_free) {
+@@ -5116,17 +4688,6 @@
+ 
+ 	/* Traverse the lists of clean and dirty compressed-only blocks. */
+ 
+-	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
+-	     b = UT_LIST_GET_NEXT(zip_list, b)) {
+-		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
+-		ut_a(buf_page_get_io_fix(b) != BUF_IO_WRITE);
+-
+-		if (b->buf_fix_count != 0
+-		    || buf_page_get_io_fix(b) != BUF_IO_NONE) {
+-			fixed_pages_number++;
+-		}
+-	}
+-
+ 	buf_flush_list_mutex_enter(buf_pool);
+ 	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
+ 	     b = UT_LIST_GET_NEXT(flush_list, b)) {
 diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
 --- a/storage/innobase/buf/buf0flu.c	2011-02-23 19:00:48.182659256 +0900
 +++ b/storage/innobase/buf/buf0flu.c	2011-02-23 19:01:19.138826278 +0900
@@ -47,31 +786,66 @@
  		if (flush_type != BUF_FLUSH_LRU) {
  
  			return(TRUE);
+@@ -527,7 +534,6 @@
+ 	case BUF_BLOCK_ZIP_DIRTY:
+ 		buf_page_set_state(bpage, BUF_BLOCK_ZIP_PAGE);
+ 		UT_LIST_REMOVE(flush_list, buf_pool->flush_list, bpage);
+-		buf_LRU_insert_zip_clean(bpage);
+ 		break;
+ 	case BUF_BLOCK_FILE_PAGE:
+ 		UT_LIST_REMOVE(flush_list, buf_pool->flush_list, bpage);
 diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
 --- a/storage/innobase/buf/buf0lru.c	2011-02-23 19:00:47.939695791 +0900
 +++ b/storage/innobase/buf/buf0lru.c	2011-02-23 19:01:19.142741970 +0900
-@@ -574,6 +574,37 @@
+@@ -574,38 +574,59 @@
  	}
  }
  
+-/********************************************************************//**
+-Insert a compressed block into buf_pool->zip_clean in the LRU order. */
 +/******************************************************************//**
 +*/
-+UNIV_INTERN
-+void
+ UNIV_INTERN
+ void
+-buf_LRU_insert_zip_clean(
+-/*=====================*/
+-	buf_page_t*	bpage)	/*!< in: pointer to the block in question */
 +buf_LRU_mark_space_was_deleted(
 +/*===========================*/
 +	ulint	id)	/*!< in: space id */
-+{
+ {
+-	buf_page_t*	b;
+-	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
 +	ulint	i;
-+
+ 
+-	//ut_ad(buf_pool_mutex_own(buf_pool));
+-	ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+-	ut_ad(mutex_own(&buf_pool->zip_mutex));
+-	ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_PAGE);
 +	for (i = 0; i < srv_buf_pool_instances; i++) {
 +		buf_pool_t*	buf_pool;
 +		buf_page_t*	bpage;
-+
++		buf_chunk_t*	chunk;
++		ulint		j, k;
+ 
+-	/* Find the first successor of bpage in the LRU list
+-	that is in the zip_clean list. */
+-	b = bpage;
+-	do {
+-		b = UT_LIST_GET_NEXT(LRU, b);
+-	} while (b && (buf_page_get_state(b) != BUF_BLOCK_ZIP_PAGE || !b->in_LRU_list));
 +		buf_pool = buf_pool_from_array(i);
-+
+ 
+-	/* Insert bpage before b, i.e., after the predecessor of b. */
+-	if (b) {
+-		b = UT_LIST_GET_PREV(zip_list, b);
+-	}
 +		mutex_enter(&buf_pool->LRU_list_mutex);
-+
+ 
+-	if (b) {
+-		UT_LIST_INSERT_AFTER(zip_list, buf_pool->zip_clean, b, bpage);
+-	} else {
+-		UT_LIST_ADD_FIRST(zip_list, buf_pool->zip_clean, bpage);
 +		bpage = UT_LIST_GET_FIRST(buf_pool->LRU);
 +
 +		while (bpage != NULL) {
@@ -82,13 +856,33 @@
 +		}
 +
 +		mutex_exit(&buf_pool->LRU_list_mutex);
-+	}
-+}
-+
- /********************************************************************//**
- Insert a compressed block into buf_pool->zip_clean in the LRU order. */
- UNIV_INTERN
-@@ -1558,6 +1589,10 @@
++
++		rw_lock_s_lock(&btr_search_latch);
++		chunk = buf_pool->chunks;
++		for (j = buf_pool->n_chunks; j--; chunk++) {
++			buf_block_t*	block	= chunk->blocks;
++			for (k = chunk->size; k--; block++) {
++				if (buf_block_get_state(block)
++				    != BUF_BLOCK_FILE_PAGE
++				    || !block->is_hashed
++				    || buf_page_get_space(&block->page) != id) {
++					continue;
++				}
++
++				rw_lock_s_unlock(&btr_search_latch);
++
++				rw_lock_x_lock(&block->lock);
++				btr_search_drop_page_hash_index(block, NULL);
++				rw_lock_x_unlock(&block->lock);
++
++				rw_lock_s_lock(&btr_search_latch);
++			}
++		}
++		rw_lock_s_unlock(&btr_search_latch);
+ 	}
+ }
+ 
+@@ -1558,6 +1579,10 @@
  		return(BUF_LRU_NOT_FREED);
  	}
  
@@ -99,6 +893,23 @@
  #ifdef UNIV_IBUF_COUNT_DEBUG
  	ut_a(ibuf_count_get(bpage->space, bpage->offset) == 0);
  #endif /* UNIV_IBUF_COUNT_DEBUG */
+@@ -1733,7 +1758,6 @@
+ 
+ 			mutex_enter(&buf_pool->zip_mutex);
+ 			if (b->state == BUF_BLOCK_ZIP_PAGE) {
+-				buf_LRU_insert_zip_clean(b);
+ 			} else {
+ 				/* Relocate on buf_pool->flush_list. */
+ 				buf_flush_relocate_on_flush_list(bpage, b);
+@@ -2038,8 +2062,6 @@
+ 		ut_a(bpage->zip.data);
+ 		ut_a(buf_page_get_zip_size(bpage));
+ 
+-		UT_LIST_REMOVE(zip_list, buf_pool->zip_clean, bpage);
+-
+ 		mutex_exit(&buf_pool->zip_mutex);
+ 		//buf_pool_mutex_exit_forbid(buf_pool);
+ 
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2011-02-23 19:00:48.223696428 +0900
 +++ b/storage/innobase/fil/fil0fil.c	2011-02-23 19:01:19.147655510 +0900
@@ -117,9 +928,9 @@
 -	ut_a(node->n_pending == 0);
 +	ut_a(node->n_pending == 0 || node->space->is_being_deleted);
  	ut_a(node->n_pending_flushes == 0);
- 	ut_a(node->modification_counter == node->flush_counter);
- 
-@@ -876,7 +877,7 @@
+ 	ut_a(node->modification_counter == node->flush_counter
+ 	     || srv_fast_shutdown == 2);
+@@ -877,7 +878,7 @@
  	ut_a(system->n_open > 0);
  	system->n_open--;
  
@@ -128,7 +939,7 @@
  		ut_a(UT_LIST_GET_LEN(system->LRU) > 0);
  
  		/* The node is in the LRU list, remove it */
-@@ -1075,7 +1076,7 @@
+@@ -1076,7 +1077,7 @@
  	ut_ad(node && system && space);
  	ut_ad(mutex_own(&(system->mutex)));
  	ut_a(node->magic_n == FIL_NODE_MAGIC_N);
@@ -137,7 +948,7 @@
  
  	if (node->open) {
  		/* We fool the assertion in fil_node_close_file() to think
-@@ -1597,6 +1598,8 @@
+@@ -1598,6 +1599,8 @@
  
  	mutex_create(fil_system_mutex_key,
  		     &fil_system->mutex, SYNC_ANY_LATCH);
@@ -146,7 +957,7 @@
  
  	fil_system->spaces = hash_create(hash_size);
  	fil_system->name_hash = hash_create(hash_size);
-@@ -2343,7 +2346,11 @@
+@@ -2344,7 +2347,11 @@
  	completely and permanently. The flag is_being_deleted also prevents
  	fil_flush() from being applied to this tablespace. */
  
@@ -158,7 +969,7 @@
  #endif
  	/* printf("Deleting tablespace %s id %lu\n", space->name, id); */
  
-@@ -4721,6 +4728,10 @@
+@@ -4722,6 +4729,10 @@
  	ulint		page_size;
  	ibool		success		= TRUE;
  
@@ -169,7 +980,7 @@
  	fil_mutex_enter_and_prepare_for_io(space_id);
  
  	space = fil_space_get_by_id(space_id);
-@@ -4732,6 +4743,7 @@
+@@ -4733,6 +4744,7 @@
  		*actual_size = space->size;
  
  		mutex_exit(&fil_system->mutex);
@@ -177,7 +988,7 @@
  
  		return(TRUE);
  	}
-@@ -4764,6 +4776,8 @@
+@@ -4765,6 +4777,8 @@
  		offset_low  = ((start_page_no - file_start_page_no)
  			       % (4096 * ((1024 * 1024) / page_size)))
  			* page_size;
@@ -186,7 +997,7 @@
  #ifdef UNIV_HOTBACKUP
  		success = os_file_write(node->name, node->handle, buf,
  					offset_low, offset_high,
-@@ -4773,8 +4787,10 @@
+@@ -4774,8 +4788,10 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
  				 page_size * n_pages,
@@ -198,7 +1009,7 @@
  		if (success) {
  			node->size += n_pages;
  			space->size += n_pages;
-@@ -4820,6 +4836,7 @@
+@@ -4821,6 +4837,7 @@
  	printf("Extended %s to %lu, actual size %lu pages\n", space->name,
  	size_after_extend, *actual_size); */
  	mutex_exit(&fil_system->mutex);
@@ -206,7 +1017,7 @@
  
  	fil_flush(space_id, TRUE);
  
-@@ -5182,6 +5199,22 @@
+@@ -5183,6 +5200,22 @@
  		srv_data_written+= len;
  	}
  
@@ -229,7 +1040,7 @@
  	/* Reserve the fil_system mutex and make sure that we can open at
  	least one file while holding it, if the file is not already open */
  
-@@ -5323,10 +5356,24 @@
+@@ -5324,10 +5357,24 @@
  #else
  	/* Queue the aio request */
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
@@ -255,7 +1066,7 @@
  	ut_a(ret);
  
  	if (mode == OS_AIO_SYNC) {
-@@ -5426,6 +5473,7 @@
+@@ -5427,6 +5474,7 @@
  	fil_node_t*	fil_node;
  	void*		message;
  	ulint		type;
@@ -263,7 +1074,7 @@
  
  	ut_ad(fil_validate_skip());
  
-@@ -5433,10 +5481,10 @@
+@@ -5434,10 +5482,10 @@
  		srv_set_io_thread_op_info(segment, "native aio handle");
  #ifdef WIN_ASYNC_IO
  		ret = os_aio_windows_handle(segment, 0, &fil_node,
@@ -276,7 +1087,7 @@
  #else
  		ut_error;
  		ret = 0; /* Eliminate compiler warning */
-@@ -5445,7 +5493,22 @@
+@@ -5446,7 +5494,22 @@
  		srv_set_io_thread_op_info(segment, "simulated aio handle");
  
  		ret = os_aio_simulated_handle(segment, &fil_node,
@@ -303,7 +1114,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:57:13.035513990 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:57:53.084513775 +0900
-@@ -12007,6 +12007,12 @@
+@@ -12024,6 +12024,12 @@
    "except for the deletion.",
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
@@ -316,7 +1127,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(page_size),
    MYSQL_SYSVAR(log_block_size),
-@@ -12097,6 +12103,7 @@
+@@ -12115,6 +12121,7 @@
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
@@ -324,7 +1135,7 @@
    NULL
  };
  
-@@ -12106,7 +12113,7 @@
+@@ -12124,7 +12131,7 @@
    &innobase_storage_engine,
    innobase_hton_name,
    plugin_author,
@@ -336,7 +1147,20 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2011-02-23 19:00:48.252696774 +0900
 +++ b/storage/innobase/include/buf0buf.h	2011-02-23 19:01:19.182655902 +0900
-@@ -1438,6 +1438,7 @@
+@@ -261,12 +261,6 @@
+ 				BUF_BLOCK_ZIP_DIRTY or BUF_BLOCK_ZIP_PAGE */
+ 	buf_page_t*	dpage)	/*!< in/out: destination control block */
+ 	__attribute__((nonnull));
+-/********************************************************************//**
+-Resizes the buffer pool. */
+-UNIV_INTERN
+-void
+-buf_pool_resize(void);
+-/*=================*/
+ /*********************************************************************//**
+ Gets the current size of buffer buf_pool in bytes.
+ @return	size in bytes */
+@@ -1441,6 +1435,7 @@
  					0 if the block was never accessed
  					in the buffer pool */
  	/* @} */
@@ -344,6 +1168,15 @@
  	ibool		is_corrupt;
  # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	ibool		file_page_was_freed;
+@@ -1780,8 +1775,6 @@
+ 	frames and buf_page_t descriptors of blocks that exist
+ 	in the buffer pool only in compressed form. */
+ 	/* @{ */
+-	UT_LIST_BASE_NODE_T(buf_page_t)	zip_clean;
+-					/*!< unmodified compressed pages */
+ 	UT_LIST_BASE_NODE_T(buf_page_t) zip_free[BUF_BUDDY_SIZES_MAX];
+ 					/*!< buddy free lists */
+ 
 diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
 --- a/storage/innobase/include/buf0buf.ic	2011-02-23 19:00:48.130659154 +0900
 +++ b/storage/innobase/include/buf0buf.ic	2011-02-23 19:01:19.185655906 +0900
@@ -358,20 +1191,25 @@
 diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
 --- a/storage/innobase/include/buf0lru.h	2011-02-23 19:00:47.977658923 +0900
 +++ b/storage/innobase/include/buf0lru.h	2011-02-23 19:01:19.188625768 +0900
-@@ -85,6 +85,13 @@
+@@ -85,13 +85,13 @@
  buf_LRU_invalidate_tablespace(
  /*==========================*/
  	ulint	id);	/*!< in: space id */
+-/********************************************************************//**
+-Insert a compressed block into buf_pool->zip_clean in the LRU order. */
 +/******************************************************************//**
 +*/
-+UNIV_INTERN
-+void
+ UNIV_INTERN
+ void
+-buf_LRU_insert_zip_clean(
+-/*=====================*/
+-	buf_page_t*	bpage);	/*!< in: pointer to the block in question */
 +buf_LRU_mark_space_was_deleted(
 +/*===========================*/
 +	ulint	id);	/*!< in: space id */
- /********************************************************************//**
- Insert a compressed block into buf_pool->zip_clean in the LRU order. */
- UNIV_INTERN
+ 
+ /******************************************************************//**
+ Try to free a block.  If bpage is a descriptor of a compressed-only
 diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
 --- a/storage/innobase/include/os0file.h	2011-02-23 19:00:48.260696646 +0900
 +++ b/storage/innobase/include/os0file.h	2011-02-23 19:01:19.190656054 +0900
@@ -493,7 +1331,7 @@
 +++ b/storage/innobase/include/univ.i	2010-12-04 15:57:53.091592933 +0900
 @@ -53,6 +53,11 @@
  #define INNODB_VERSION_MINOR	1
- #define INNODB_VERSION_BUGFIX	7
+ #define INNODB_VERSION_BUGFIX	8
  
 +#ifndef PERCONA_INNODB_VERSION
 +#define PERCONA_INNODB_VERSION 20.1
@@ -524,7 +1362,7 @@
  	fil_node_t*	message1;	/*!< message which is given by the */
  	void*		message2;	/*!< the requester of an aio operation
  					and which can be used to identify
-@@ -3685,7 +3686,8 @@
+@@ -3686,7 +3687,8 @@
  				offset */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -534,7 +1372,7 @@
  {
  	os_aio_slot_t*	slot = NULL;
  #ifdef WIN_ASYNC_IO
-@@ -3774,6 +3776,7 @@
+@@ -3775,6 +3777,7 @@
  	slot->offset   = offset;
  	slot->offset_high = offset_high;
  	slot->io_already_done = FALSE;
@@ -542,7 +1380,7 @@
  
  #ifdef WIN_ASYNC_IO
  	control = &(slot->control);
-@@ -4061,6 +4064,7 @@
+@@ -4062,6 +4065,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -550,7 +1388,7 @@
  	trx_t*		trx)
  {
  	os_aio_array_t*	array;
-@@ -4149,7 +4153,7 @@
+@@ -4157,7 +4161,7 @@
  		trx->io_read += n;
  	}
  	slot = os_aio_array_reserve_slot(type, array, message1, message2, file,
@@ -559,7 +1397,7 @@
  	if (type == OS_FILE_READ) {
  		if (srv_use_native_aio) {
  			os_n_file_reads++;
-@@ -4268,7 +4272,8 @@
+@@ -4276,7 +4280,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -569,7 +1407,7 @@
  {
  	ulint		orig_seg	= segment;
  	os_aio_array_t*	array;
-@@ -4347,6 +4352,7 @@
+@@ -4355,6 +4360,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -577,7 +1415,7 @@
  
  	if (ret && len == slot->len) {
  		ret_val = TRUE;
-@@ -4575,7 +4581,8 @@
+@@ -4583,7 +4589,8 @@
  				aio operation failed, these output
  				parameters are valid and can be used to
  				restart the operation. */
@@ -587,7 +1425,7 @@
  {
  	ulint		segment;
  	os_aio_array_t*	array;
-@@ -4648,6 +4655,7 @@
+@@ -4656,6 +4663,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -595,7 +1433,7 @@
  
  	if ((slot->ret == 0) && (slot->n_bytes == (long)slot->len)) {
  		ret = TRUE;
-@@ -4701,7 +4709,8 @@
+@@ -4709,7 +4717,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -605,7 +1443,7 @@
  {
  	os_aio_array_t*	array;
  	ulint		segment;
-@@ -4997,6 +5006,7 @@
+@@ -5005,6 +5014,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -638,10 +1476,60 @@
  	if (prebuilt->sql_stat_start) {
  		node->state = INS_NODE_SET_IX_LOCK;
  		prebuilt->sql_stat_start = FALSE;
+@@ -2602,10 +2610,29 @@
+ 
+ 			err = DB_ERROR;
+ 		} else {
++			dict_index_t*	index;
++
+ 			/* Set the flag which tells that now it is legal to
+ 			IMPORT a tablespace for this table */
+ 			table->tablespace_discarded = TRUE;
+ 			table->ibd_file_missing = TRUE;
++
++			/* check adaptive hash entries */
++			index = dict_table_get_first_index(table);
++			while (index) {
++				ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id);
++				if (ref_count) {
++					fprintf(stderr, "InnoDB: Warning:"
++						" hash index ref_count (%lu) is not zero"
++						" after fil_discard_tablespace().\n"
++						"index: \"%s\""
++						" table: \"%s\"\n",
++						ref_count,
++						index->name,
++						table->name);
++				}
++				index = dict_table_get_next_index(index);
++			}
+ 		}
+ 	}
+ 
+@@ -2954,6 +2981,19 @@
+ 			table->space = space;
+ 			index = dict_table_get_first_index(table);
+ 			do {
++				ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id);
++				/* check adaptive hash entries */
++				if (ref_count) {
++					fprintf(stderr, "InnoDB: Warning:"
++						" hash index ref_count (%lu) is not zero"
++						" after fil_discard_tablespace().\n"
++						"index: \"%s\""
++						" table: \"%s\"\n",
++						ref_count,
++						index->name,
++						table->name);
++				}
++
+ 				index->space = space;
+ 				index = dict_table_get_next_index(index);
+ 			} while (index);
 diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
 --- a/storage/innobase/row/row0sel.c	2010-12-04 15:52:23.494514495 +0900
 +++ b/storage/innobase/row/row0sel.c	2010-12-04 16:01:38.320883699 +0900
-@@ -3366,6 +3366,7 @@
+@@ -3367,6 +3367,7 @@
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
  	ulint*		offsets				= offsets_;
  	ibool		table_lock_waited		= FALSE;
@@ -649,7 +1537,7 @@
  
  	rec_offs_init(offsets_);
  
-@@ -3737,6 +3738,17 @@
+@@ -3738,6 +3739,17 @@
  
  	/* Do some start-of-statement preparations */
  
@@ -667,7 +1555,7 @@
  	if (!prebuilt->sql_stat_start) {
  		/* No need to set an intention lock or assign a read view */
  
-@@ -3747,6 +3759,18 @@
+@@ -3748,6 +3760,18 @@
  			      " perform a consistent read\n"
  			      "InnoDB: but the read view is not assigned!\n",
  			      stderr);

=== modified file 'innodb_io_patches.patch'
--- innodb_io_patches.patch	2011-07-07 15:13:12 +0000
+++ innodb_io_patches.patch	2011-08-01 03:32:34 +0000
@@ -62,7 +62,7 @@
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2011-07-07 18:43:12.000000000 +0400
 +++ b/storage/innobase/fil/fil0fil.c	2011-07-07 19:01:22.000000000 +0400
-@@ -2600,7 +2600,7 @@
+@@ -2601,7 +2601,7 @@
  
  		os_thread_sleep(20000);
  
@@ -71,7 +71,7 @@
  
  		goto retry;
  
-@@ -2814,7 +2814,7 @@
+@@ -2815,7 +2815,7 @@
  		goto error_exit;
  	}
  
@@ -80,7 +80,7 @@
  
  	if (!ret) {
  		fputs("InnoDB: Error: file flush of tablespace ", stderr);
-@@ -3000,7 +3000,7 @@
+@@ -3001,7 +3001,7 @@
  		}
  	}
  
@@ -89,7 +89,7 @@
  	if (!success) {
  
  		goto func_exit;
-@@ -3022,7 +3022,7 @@
+@@ -3023,7 +3023,7 @@
  
  		goto func_exit;
  	}
@@ -98,7 +98,7 @@
  func_exit:
  	os_file_close(file);
  	ut_free(buf2);
-@@ -4005,7 +4005,7 @@
+@@ -4006,7 +4006,7 @@
  	size_after_extend, *actual_size); */
  	mutex_exit(&fil_system->mutex);
  
@@ -107,7 +107,7 @@
  
  	return(success);
  }
-@@ -4576,8 +4576,9 @@
+@@ -4577,8 +4577,9 @@
  void
  fil_flush(
  /*======*/
@@ -118,7 +118,7 @@
  {
  	fil_space_t*	space;
  	fil_node_t*	node;
-@@ -4648,7 +4649,7 @@
+@@ -4649,7 +4650,7 @@
  			/* fprintf(stderr, "Flushing to file %s\n",
  			node->name); */
  
@@ -127,7 +127,7 @@
  
  			mutex_enter(&fil_system->mutex);
  
-@@ -4731,7 +4732,7 @@
+@@ -4732,7 +4733,7 @@
  	a non-existing space id. */
  	for (i = 0; i < n_space_ids; i++) {
  
@@ -139,7 +139,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2011-07-07 18:43:12.000000000 +0400
 +++ b/storage/innobase/handler/ha_innodb.cc	2011-07-07 19:01:24.000000000 +0400
-@@ -444,6 +444,12 @@
+@@ -445,6 +445,12 @@
    "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
    NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
  
@@ -152,7 +152,7 @@
  
  static handler *innobase_create_handler(handlerton *hton,
                                          TABLE_SHARE *table,
-@@ -838,6 +844,17 @@
+@@ -839,6 +845,17 @@
  	}
  }
  
@@ -170,7 +170,7 @@
  /********************************************************************//**
  Obtain the InnoDB transaction of a MySQL thread.
  @return	reference to transaction pointer */
-@@ -2437,6 +2454,9 @@
+@@ -2443,6 +2460,9 @@
  	srv_n_read_io_threads = (ulint) innobase_read_io_threads;
  	srv_n_write_io_threads = (ulint) innobase_write_io_threads;
  
@@ -180,7 +180,7 @@
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
-@@ -11025,7 +11045,7 @@
+@@ -11037,7 +11057,7 @@
    PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
    "Purge threads can be either 0 or 1.",
    NULL, NULL,
@@ -189,7 +189,7 @@
    0,			/* Minimum value */
    1, 0);		/* Maximum value */
  
-@@ -11067,12 +11087,18 @@
+@@ -11079,12 +11099,18 @@
    innodb_file_format_max_validate,
    innodb_file_format_max_update, "Antelope");
  
@@ -214,7 +214,7 @@
  
  static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11167,7 +11193,7 @@
+@@ -11184,7 +11210,7 @@
  static MYSQL_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
@@ -223,7 +223,7 @@
  
  static MYSQL_SYSVAR_LONG(buffer_pool_instances, innobase_buffer_pool_instances,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11319,6 +11345,95 @@
+@@ -11336,6 +11362,95 @@
    "trigger a readahead.",
    NULL, NULL, 56, 0, 64, 0);
  
@@ -319,15 +319,15 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11339,6 +11454,7 @@
+@@ -11356,6 +11471,7 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
 +  MYSQL_SYSVAR(use_global_flush_log_at_trx_commit),
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
-   MYSQL_SYSVAR(locks_unsafe_for_binlog),
-@@ -11376,6 +11492,13 @@
+   MYSQL_SYSVAR(large_prefix),
+@@ -11394,6 +11510,13 @@
    MYSQL_SYSVAR(show_verbose_locks),
    MYSQL_SYSVAR(show_locks_held),
    MYSQL_SYSVAR(version),
@@ -837,7 +837,7 @@
  	}
  # endif /* UNIV_DO_FLUSH */
  
-@@ -4289,7 +4305,7 @@
+@@ -4296,7 +4312,7 @@
  #ifdef UNIV_DO_FLUSH
  		if (slot->type == OS_FILE_WRITE
  		    && !os_do_not_call_flush_at_each_write) {
@@ -846,7 +846,7 @@
  				ut_error;
  			}
  		}
-@@ -4590,7 +4606,7 @@
+@@ -4597,7 +4613,7 @@
  #ifdef UNIV_DO_FLUSH
  		if (slot->type == OS_FILE_WRITE
  		    && !os_do_not_call_flush_at_each_write)

=== added file 'innodb_kill_idle_transaction.patch'
--- innodb_kill_idle_transaction.patch	1970-01-01 00:00:00 +0000
+++ innodb_kill_idle_transaction.patch	2011-08-01 03:32:34 +0000
@@ -0,0 +1,277 @@
+# name       : innodb_kill_idle_transaction.patch
+# introduced : 5.5.14
+# maintainer : Yasufumi
+#
+#!!! notice !!!
+# Any small change to this file in the main branch
+# should be done or reviewed by the maintainer!
+diff -ruN a/include/mysql/plugin.h b/include/mysql/plugin.h
+--- a/include/mysql/plugin.h	2011-06-22 01:42:39.000000000 +0900
++++ b/include/mysql/plugin.h	2011-07-12 22:19:58.000000000 +0900
+@@ -625,6 +625,12 @@
+ */
+ void thd_set_ha_data(MYSQL_THD thd, const struct handlerton *hton,
+                      const void *ha_data);
++
++int thd_command(const MYSQL_THD thd);
++long long thd_start_time(const MYSQL_THD thd);
++void thd_kill(MYSQL_THD thd);
++#define EXTENDED_FOR_KILLIDLE
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff -ruN a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
+--- a/include/mysql/plugin_audit.h.pp	2011-06-22 01:42:39.000000000 +0900
++++ b/include/mysql/plugin_audit.h.pp	2011-07-13 00:53:06.000000000 +0900
+@@ -195,6 +195,9 @@
+ void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
+ void thd_set_ha_data(void* thd, const struct handlerton *hton,
+                      const void *ha_data);
++int thd_command(const void* thd);
++long long thd_start_time(const void* thd);
++void thd_kill(void* thd);
+ struct mysql_event_general
+ {
+   unsigned int event_subclass;
+diff -ruN a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp
+--- a/include/mysql/plugin_auth.h.pp	2011-06-22 01:42:39.000000000 +0900
++++ b/include/mysql/plugin_auth.h.pp	2011-07-13 00:53:06.000000000 +0900
+@@ -195,6 +195,9 @@
+ void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
+ void thd_set_ha_data(void* thd, const struct handlerton *hton,
+                      const void *ha_data);
++int thd_command(const void* thd);
++long long thd_start_time(const void* thd);
++void thd_kill(void* thd);
+ #include <mysql/plugin_auth_common.h>
+ typedef struct st_plugin_vio_info
+ {
+diff -ruN a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp
+--- a/include/mysql/plugin_ftparser.h.pp	2011-06-22 01:42:39.000000000 +0900
++++ b/include/mysql/plugin_ftparser.h.pp	2011-07-13 00:53:06.000000000 +0900
+@@ -148,6 +148,9 @@
+ void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
+ void thd_set_ha_data(void* thd, const struct handlerton *hton,
+                      const void *ha_data);
++int thd_command(const void* thd);
++long long thd_start_time(const void* thd);
++void thd_kill(void* thd);
+ enum enum_ftparser_mode
+ {
+   MYSQL_FTPARSER_SIMPLE_MODE= 0,
+diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
+--- a/sql/sql_class.cc	2011-06-22 01:42:40.000000000 +0900
++++ b/sql/sql_class.cc	2011-07-12 22:23:35.000000000 +0900
+@@ -711,6 +711,26 @@
+   return buffer;
+ }
+ 
++/* extend for kill session of idle transaction from engine */
++extern "C"
++int thd_command(const THD* thd)
++{
++  return (int) thd->command;
++}
++
++extern "C"
++long long thd_start_time(const THD* thd)
++{
++  return (long long) thd->start_time;
++}
++
++extern "C"
++void thd_kill(THD* thd)
++{
++  mysql_mutex_lock(&thd->LOCK_thd_data);
++  thd->awake(THD::KILL_CONNECTION);
++  mysql_mutex_unlock(&thd->LOCK_thd_data);
++}
+ 
+ /**
+   Implementation of Drop_table_error_handler::handle_condition().
+diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
+--- a/storage/innobase/handler/ha_innodb.cc	2011-07-12 17:10:37.000000000 +0900
++++ b/storage/innobase/handler/ha_innodb.cc	2011-07-12 22:33:06.000000000 +0900
+@@ -2828,6 +2828,10 @@
+ 
+ 	innobase_commit_concurrency_init_default();
+ 
++#ifndef EXTENDED_FOR_KILLIDLE
++	srv_kill_idle_transaction = 0;
++#endif
++
+ #ifdef HAVE_PSI_INTERFACE
+ 	/* Register keys with MySQL performance schema */
+ 	if (PSI_server) {
+@@ -11586,6 +11590,48 @@
+ 	return(false);
+ }
+ 
++/***********************************************************************
++functions for kill session of idle transaction */
++extern "C"
++ibool
++innobase_thd_is_idle(
++/*=================*/
++	const void*	thd)	/*!< in: thread handle (THD*) */
++{
++#ifdef EXTENDED_FOR_KILLIDLE
++	return(thd_command((const THD*) thd) == COM_SLEEP);
++#else
++	return(FALSE);
++#endif
++}
++
++extern "C"
++ib_int64_t
++innobase_thd_get_start_time(
++/*========================*/
++	const void*	thd)	/*!< in: thread handle (THD*) */
++{
++#ifdef EXTENDED_FOR_KILLIDLE
++	return((ib_int64_t)thd_start_time((const THD*) thd));
++#else
++	return(0); /*dummy value*/
++#endif
++}
++
++extern "C"
++void
++innobase_thd_kill(
++/*==============*/
++	void*	thd)
++{
++#ifdef EXTENDED_FOR_KILLIDLE
++	thd_kill((THD*) thd);
++#else
++	return;
++#endif
++}
++
++
+ static SHOW_VAR innodb_status_variables_export[]= {
+   {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
+   {NullS, NullS, SHOW_LONG}
+@@ -11872,6 +11918,15 @@
+   "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
+   NULL, NULL, 500L, 1L, ~0L, 0);
+ 
++static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
++  PLUGIN_VAR_RQCMDARG,
++#ifdef EXTENDED_FOR_KILLIDLE
++  "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.",
++#else
++  "No effect for this build.",
++#endif
++  NULL, NULL, 0, 0, LONG_MAX, 0);
++
+ static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
+   "Number of file I/O threads in InnoDB.",
+@@ -12162,6 +12217,7 @@
+   MYSQL_SYSVAR(fast_checksum),
+   MYSQL_SYSVAR(commit_concurrency),
+   MYSQL_SYSVAR(concurrency_tickets),
++  MYSQL_SYSVAR(kill_idle_transaction),
+   MYSQL_SYSVAR(data_file_path),
+   MYSQL_SYSVAR(doublewrite_file),
+   MYSQL_SYSVAR(data_home_dir),
+diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
+--- a/storage/innobase/include/srv0srv.h	2011-07-12 17:10:37.000000000 +0900
++++ b/storage/innobase/include/srv0srv.h	2011-07-12 22:33:57.000000000 +0900
+@@ -291,6 +291,7 @@
+ extern ulint	srv_activity_count;
+ extern ulint	srv_fatal_semaphore_wait_threshold;
+ extern ulint	srv_dml_needed_delay;
++extern lint	srv_kill_idle_transaction;
+ 
+ extern mutex_t*	kernel_mutex_temp;/* mutex protecting the server, trx structs,
+ 				query threads, and lock table: we allocate
+diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
+--- a/storage/innobase/include/trx0trx.h	2011-07-12 16:47:24.000000000 +0900
++++ b/storage/innobase/include/trx0trx.h	2011-07-12 22:35:39.000000000 +0900
+@@ -594,6 +594,8 @@
+ 					replication has processed */
+ 	const char*	mysql_relay_log_file_name;
+ 	ib_int64_t	mysql_relay_log_pos;
++	time_t		idle_start;
++	ib_int64_t	last_stmt_start;
+ 	/*------------------------------*/
+ 	ulint		n_mysql_tables_in_use; /* number of Innobase tables
+ 					used in the processing of the current
+diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
+--- a/storage/innobase/srv/srv0srv.c	2011-07-12 17:10:37.000000000 +0900
++++ b/storage/innobase/srv/srv0srv.c	2011-07-12 22:43:22.000000000 +0900
+@@ -87,6 +87,11 @@
+ #include "mysql/plugin.h"
+ #include "mysql/service_thd_wait.h"
+ 
++/* prototypes of new functions added to ha_innodb.cc for kill_idle_transaction */
++ibool		innobase_thd_is_idle(const void* thd);
++ib_int64_t	innobase_thd_get_start_time(const void* thd);
++void		innobase_thd_kill(void* thd);
++
+ /* prototypes for new functions added to ha_innodb.cc */
+ ibool	innobase_get_slow_log();
+ 
+@@ -97,6 +102,9 @@
+ /* The following is the maximum allowed duration of a lock wait. */
+ UNIV_INTERN ulint	srv_fatal_semaphore_wait_threshold = 600;
+ 
++/**/
++UNIV_INTERN lint	srv_kill_idle_transaction = 0;
++
+ /* How much data manipulation language (DML) statements need to be delayed,
+ in microseconds, in order to reduce the lagging of the purge thread. */
+ UNIV_INTERN ulint	srv_dml_needed_delay = 0;
+@@ -2826,6 +2834,36 @@
+ 		old_sema = sema;
+ 	}
+ 
++	if (srv_kill_idle_transaction && trx_sys) {
++		trx_t*	trx;
++		time_t	now;
++rescan_idle:
++		now = time(NULL);
++		mutex_enter(&kernel_mutex);
++		trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
++		while (trx) {
++			if (trx->conc_state == TRX_ACTIVE
++			    && trx->mysql_thd
++			    && innobase_thd_is_idle(trx->mysql_thd)) {
++				ib_int64_t	start_time; /* as stmt ID */
++
++				start_time = innobase_thd_get_start_time(trx->mysql_thd);
++				if (trx->last_stmt_start != start_time) {
++					trx->idle_start = now;
++					trx->last_stmt_start = start_time;
++				} else if (difftime(now, trx->idle_start)
++					   > srv_kill_idle_transaction) {
++					/* kill the session */
++					mutex_exit(&kernel_mutex);
++					innobase_thd_kill(trx->mysql_thd);
++					goto rescan_idle;
++				}
++			}
++			trx = UT_LIST_GET_NEXT(mysql_trx_list, trx);
++		}
++		mutex_exit(&kernel_mutex);
++	}
++
+ 	/* Flush stderr so that a database user gets the output
+ 	to possible MySQL error file */
+ 
+diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
+--- a/storage/innobase/trx/trx0trx.c	2011-07-12 17:05:25.000000000 +0900
++++ b/storage/innobase/trx/trx0trx.c	2011-07-12 22:44:08.000000000 +0900
+@@ -143,6 +143,9 @@
+ 	trx->mysql_relay_log_file_name = "";
+ 	trx->mysql_relay_log_pos = 0;
+ 
++	trx->idle_start = 0;
++	trx->last_stmt_start = 0;
++
+ 	mutex_create(trx_undo_mutex_key, &trx->undo_mutex, SYNC_TRX_UNDO);
+ 
+ 	trx->rseg = NULL;

=== modified file 'innodb_lru_dump_restore.patch'
--- innodb_lru_dump_restore.patch	2011-06-10 10:07:06 +0000
+++ innodb_lru_dump_restore.patch	2011-08-01 03:32:34 +0000
@@ -308,7 +308,7 @@
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2010-12-03 17:49:11.581025127 +0900
 +++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:33:37.632482885 +0900
-@@ -5289,6 +5289,70 @@
+@@ -5290,6 +5290,70 @@
  	return(DB_SUCCESS);
  }
  
@@ -382,7 +382,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:49:11.589956135 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:33:37.645555490 +0900
-@@ -11793,6 +11793,12 @@
+@@ -11810,6 +11810,12 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -395,7 +395,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11874,6 +11880,7 @@
+@@ -11892,6 +11898,7 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),

=== modified file 'innodb_opt_lru_count.patch'
--- innodb_opt_lru_count.patch	2011-05-10 11:57:42 +0000
+++ innodb_opt_lru_count.patch	2011-08-01 03:32:34 +0000
@@ -277,7 +277,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-03 15:20:49.608986590 +0900
-@@ -1387,11 +1387,11 @@
+@@ -1390,11 +1390,11 @@
  
  	UT_LIST_NODE_T(buf_page_t) LRU;
  					/*!< node of the LRU list */

=== modified file 'innodb_overwrite_relay_log_info.patch'
--- innodb_overwrite_relay_log_info.patch	2011-06-10 10:07:06 +0000
+++ innodb_overwrite_relay_log_info.patch	2011-08-01 03:32:34 +0000
@@ -56,7 +56,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;
-@@ -2248,6 +2268,89 @@
+@@ -2254,6 +2274,89 @@
  	}
  #endif /* DBUG_OFF */
  
@@ -146,7 +146,7 @@
  	/* Check that values don't overflow on 32-bit systems. */
  	if (sizeof(ulint) == 4) {
  		if (innobase_buffer_pool_size > UINT_MAX32) {
-@@ -2546,6 +2649,76 @@
+@@ -2552,6 +2655,76 @@
  		goto mem_free_and_error;
  	}
  
@@ -223,7 +223,7 @@
  	innobase_old_blocks_pct = buf_LRU_old_ratio_update(
  		innobase_old_blocks_pct, TRUE);
  
-@@ -2658,6 +2831,25 @@
+@@ -2666,6 +2839,25 @@
  	trx_t*	trx)	/*!< in: transaction handle */
  {
  	if (trx_is_started(trx)) {
@@ -249,7 +249,7 @@
  
  		trx_commit_for_mysql(trx);
  	}
-@@ -11014,6 +11206,12 @@
+@@ -11026,6 +11218,12 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -262,7 +262,7 @@
  static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "Enable InnoDB doublewrite buffer (enabled by default). "
-@@ -11474,6 +11672,7 @@
+@@ -11492,6 +11690,7 @@
    MYSQL_SYSVAR(old_blocks_pct),
    MYSQL_SYSVAR(old_blocks_time),
    MYSQL_SYSVAR(open_files),

=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2011-06-29 09:32:51 +0000
+++ innodb_pass_corrupt_table.patch	2011-08-01 03:32:34 +0000
@@ -243,7 +243,7 @@
  	ut_ad(page_is_leaf(buf_block_get_frame(block)));
  
  	rec = btr_cur_get_rec(cursor);
-@@ -3628,6 +3711,11 @@
+@@ -3640,6 +3723,11 @@
  
  		page = btr_cur_get_page(&cursor);
  
@@ -357,7 +357,7 @@
  	block_mutex = buf_page_get_mutex_enter(bpage);
  
  	rw_lock_s_unlock(&buf_pool->page_hash_latch);
-@@ -3059,6 +3072,13 @@
+@@ -3060,6 +3073,13 @@
  		return(NULL);
  	}
  
@@ -478,7 +478,7 @@
  			goto next_loop;
  
  		cached_foreign_tables = 0;
-@@ -4332,6 +4333,12 @@
+@@ -4366,6 +4367,12 @@
  	heap = mem_heap_create(1000);
  
  	while (index) {
@@ -491,7 +491,7 @@
  		size = btr_get_size(index, BTR_TOTAL_SIZE);
  
  		index->stat_index_size = size;
-@@ -4479,6 +4486,12 @@
+@@ -4513,6 +4520,12 @@
  	heap = mem_heap_create(1000);
  
  	while (index) {
@@ -504,7 +504,7 @@
  /*===========================================*/
  {
  	dict_table_t*	sys_stats;
-@@ -4671,6 +4684,13 @@
+@@ -4705,6 +4718,13 @@
  		     || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO
  			 && dict_index_is_clust(index)))) {
  			ulint	size;
@@ -518,7 +518,7 @@
  			size = btr_get_size(index, BTR_TOTAL_SIZE);
  
  			index->stat_index_size = size;
-@@ -5467,4 +5487,42 @@
+@@ -5501,4 +5521,42 @@
  		rw_lock_free(&dict_table_stats_latches[i]);
  	}
  }
@@ -584,7 +584,7 @@
  	UT_LIST_NODE_T(fil_space_t) space_list;
  				/*!< list of all spaces */
  	ulint		magic_n;/*!< FIL_SPACE_MAGIC_N */
-@@ -1293,6 +1294,8 @@
+@@ -1294,6 +1295,8 @@
  		    ut_fold_string(name), space);
  	space->is_in_unflushed_spaces = FALSE;
  
@@ -593,7 +593,7 @@
  	UT_LIST_ADD_LAST(space_list, fil_system->space_list, space);
  
  	mutex_exit(&fil_system->mutex);
-@@ -5267,6 +5270,34 @@
+@@ -5268,6 +5271,34 @@
  	ut_a(byte_offset % OS_FILE_LOG_BLOCK_SIZE == 0);
  	ut_a((len % OS_FILE_LOG_BLOCK_SIZE) == 0);
  
@@ -628,7 +628,7 @@
  #ifdef UNIV_HOTBACKUP
  	/* In ibbackup do normal i/o, not aio */
  	if (type == OS_FILE_READ) {
-@@ -5281,6 +5312,8 @@
+@@ -5282,6 +5313,8 @@
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
  		     offset_low, offset_high, len, node, message, trx);
  #endif
@@ -637,7 +637,7 @@
  	ut_a(ret);
  
  	if (mode == OS_AIO_SYNC) {
-@@ -5781,3 +5814,46 @@
+@@ -5782,3 +5815,46 @@
                 return 0;
         }
  }
@@ -798,7 +798,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:37:50.578486593 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:38:18.137549396 +0900
-@@ -3972,6 +3972,12 @@
+@@ -3980,6 +3980,12 @@
  		DBUG_RETURN(1);
  	}
  
@@ -811,7 +811,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
-@@ -3999,6 +4005,19 @@
+@@ -4007,6 +4013,19 @@
  	/* Get pointer to a table object in InnoDB dictionary cache */
  	ib_table = dict_table_get(norm_name, TRUE);
  	
@@ -831,7 +831,7 @@
  	if (NULL == ib_table) {
  		if (is_part && retries < 10) {
  			++retries;
-@@ -5163,6 +5182,10 @@
+@@ -5175,6 +5194,10 @@
  
  	ha_statistic_increment(&SSV::ha_write_count);
  
@@ -842,7 +842,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
  		table->timestamp_field->set_time();
  
-@@ -5380,6 +5403,10 @@
+@@ -5392,6 +5415,10 @@
  func_exit:
  	innobase_active_small();
  
@@ -853,7 +853,7 @@
  	DBUG_RETURN(error_result);
  }
  
-@@ -5556,6 +5583,10 @@
+@@ -5568,6 +5595,10 @@
  
  	ha_statistic_increment(&SSV::ha_update_count);
  
@@ -864,7 +864,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
  		table->timestamp_field->set_time();
  
-@@ -5645,6 +5676,10 @@
+@@ -5657,6 +5688,10 @@
  
  	innobase_active_small();
  
@@ -875,7 +875,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5666,6 +5701,10 @@
+@@ -5678,6 +5713,10 @@
  
  	ha_statistic_increment(&SSV::ha_delete_count);
  
@@ -886,7 +886,7 @@
  	if (!prebuilt->upd_node) {
  		row_get_prebuilt_update_vector(prebuilt);
  	}
-@@ -5692,6 +5731,10 @@
+@@ -5704,6 +5743,10 @@
  
  	innobase_active_small();
  
@@ -897,7 +897,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5931,6 +5974,10 @@
+@@ -5943,6 +5986,10 @@
  
  	ha_statistic_increment(&SSV::ha_read_key_count);
  
@@ -908,7 +908,7 @@
  	index = prebuilt->index;
  
  	if (UNIV_UNLIKELY(index == NULL)) {
-@@ -5996,6 +6043,10 @@
+@@ -6008,6 +6055,10 @@
  		ret = DB_UNSUPPORTED;
  	}
  
@@ -919,7 +919,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -6111,6 +6162,10 @@
+@@ -6123,6 +6174,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -930,7 +930,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -6201,6 +6256,10 @@
+@@ -6213,6 +6268,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -941,7 +941,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -6210,6 +6269,10 @@
+@@ -6222,6 +6281,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -952,7 +952,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7476,10 +7539,18 @@
+@@ -7488,10 +7551,18 @@
  
  	update_thd(ha_thd());
  
@@ -971,7 +971,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -7980,6 +8051,16 @@
+@@ -7992,6 +8063,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -988,7 +988,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
-@@ -8157,7 +8238,7 @@
+@@ -8169,7 +8250,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -997,7 +997,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8450,10 +8531,18 @@
+@@ -8462,10 +8543,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -1016,7 +1016,7 @@
  	return(0);
  }
  
-@@ -8635,6 +8724,10 @@
+@@ -8647,6 +8736,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -1027,7 +1027,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9405,6 +9498,10 @@
+@@ -9417,6 +9510,10 @@
  
  	update_thd(thd);
  
@@ -1038,7 +1038,7 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11807,6 +11904,26 @@
+@@ -11824,6 +11921,26 @@
    "0 (the default) disables automatic dumps.",
    NULL, NULL, 0, 0, UINT_MAX32, 0);
  
@@ -1065,7 +1065,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11893,6 +12010,7 @@
+@@ -11911,6 +12028,7 @@
    MYSQL_SYSVAR(purge_threads),
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
@@ -1118,7 +1118,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-03 15:49:59.218956083 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:38:18.164513667 +0900
-@@ -986,7 +986,7 @@
+@@ -989,7 +989,7 @@
  	const buf_block_t*	block)	/*!< in: pointer to the control block */
  	__attribute__((pure));
  #else /* UNIV_DEBUG */
@@ -1127,7 +1127,7 @@
  #endif /* UNIV_DEBUG */
  /*********************************************************************//**
  Gets the space id of a block.
-@@ -1433,6 +1433,7 @@
+@@ -1436,6 +1436,7 @@
  					0 if the block was never accessed
  					in the buffer pool */
  	/* @} */
@@ -1163,7 +1163,7 @@
 diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
 --- a/storage/innobase/include/dict0dict.h	2010-12-03 17:30:16.306955940 +0900
 +++ b/storage/innobase/include/dict0dict.h	2010-12-04 15:38:18.169513750 +0900
-@@ -1245,6 +1245,15 @@
+@@ -1258,6 +1258,15 @@
  dict_close(void);
  /*============*/
  
@@ -1182,7 +1182,7 @@
 diff -ruN a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
 --- a/storage/innobase/include/dict0mem.h	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/include/dict0mem.h	2010-12-04 15:38:18.171513956 +0900
-@@ -640,6 +640,7 @@
+@@ -666,6 +666,7 @@
  				the AUTOINC lock on this table. */
  				/* @} */
  	/*----------------------*/
@@ -1335,7 +1335,7 @@
 diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
 --- a/storage/innobase/row/row0sel.c	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/row/row0sel.c	2010-12-04 15:38:18.205551115 +0900
-@@ -3853,6 +3853,13 @@
+@@ -3854,6 +3854,13 @@
  	/* PHASE 4: Look for matching records in a loop */
  
  	rec = btr_pcur_get_rec(pcur);
@@ -1349,7 +1349,7 @@
  	ut_ad(!!page_rec_is_comp(rec) == comp);
  #ifdef UNIV_SEARCH_DEBUG
  	/*
-@@ -3930,7 +3937,13 @@
+@@ -3931,7 +3938,13 @@
  	if (UNIV_UNLIKELY(next_offs >= UNIV_PAGE_SIZE - PAGE_DIR)) {
  
  wrong_offs:
@@ -1364,7 +1364,7 @@
  			ut_print_timestamp(stderr);
  			buf_page_print(page_align(rec), 0);
  			fprintf(stderr,
-@@ -3981,7 +3994,8 @@
+@@ -3982,7 +3995,8 @@
  
  	offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
  

=== modified file 'innodb_recovery_patches.patch'
--- innodb_recovery_patches.patch	2011-06-29 09:32:51 +0000
+++ innodb_recovery_patches.patch	2011-08-01 03:32:34 +0000
@@ -117,7 +117,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;
-@@ -2576,6 +2577,8 @@
+@@ -2582,6 +2583,8 @@
  
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
@@ -126,7 +126,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11274,6 +11277,11 @@
+@@ -11286,6 +11289,11 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -138,7 +138,7 @@
  static MYSQL_SYSVAR_BOOL(recovery_update_relay_log, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11747,6 +11755,7 @@
+@@ -11764,6 +11772,7 @@
    MYSQL_SYSVAR(data_file_path),
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),
@@ -441,7 +441,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
  # include "os0thread.h"
-@@ -4270,6 +4271,18 @@
+@@ -4278,6 +4279,18 @@
  					   INFINITE);
  	}
  

=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2011-06-29 09:32:51 +0000
+++ innodb_separate_doublewrite.patch	2011-08-01 03:32:34 +0000
@@ -84,7 +84,7 @@
  			/* The system tablespace always exists. */
  		} else if (in_crash_recovery) {
  			/* Check that the tablespace (the .ibd file) really
-@@ -1623,7 +1624,7 @@
+@@ -1682,7 +1683,7 @@
  	space = mach_read_from_4(field);
  
  	/* Check if the tablespace exists and has the right name */
@@ -93,7 +93,7 @@
  		flags = dict_sys_tables_get_flags(rec);
  
  		if (UNIV_UNLIKELY(flags == ULINT_UNDEFINED)) {
-@@ -1776,7 +1777,7 @@
+@@ -1835,7 +1836,7 @@
  		goto err_exit;
  	}
  
@@ -149,7 +149,7 @@
  		/* Put the node to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
-@@ -875,7 +875,7 @@
+@@ -876,7 +876,7 @@
  	ut_a(system->n_open > 0);
  	system->n_open--;
  
@@ -158,7 +158,7 @@
  		ut_a(UT_LIST_GET_LEN(system->LRU) > 0);
  
  		/* The node is in the LRU list, remove it */
-@@ -961,7 +961,7 @@
+@@ -962,7 +962,7 @@
  retry:
  	mutex_enter(&fil_system->mutex);
  
@@ -167,7 +167,7 @@
  		/* We keep log files and system tablespace files always open;
  		this is important in preventing deadlocks in this module, as
  		a page read completion often performs another read from the
-@@ -1192,7 +1192,7 @@
+@@ -1193,7 +1193,7 @@
  			" tablespace memory cache!\n",
  			(ulong) space->id);
  
@@ -176,7 +176,7 @@
  
  			mutex_exit(&fil_system->mutex);
  
-@@ -1254,6 +1254,7 @@
+@@ -1255,6 +1255,7 @@
  	space->mark = FALSE;
  
  	if (UNIV_LIKELY(purpose == FIL_TABLESPACE && !recv_recovery_on)
@@ -184,7 +184,7 @@
  	    && UNIV_UNLIKELY(id > fil_system->max_assigned_id)) {
  		if (!fil_system->space_id_reuse_warned) {
  			fil_system->space_id_reuse_warned = TRUE;
-@@ -1337,7 +1338,7 @@
+@@ -1338,7 +1339,7 @@
  			(ulong) SRV_LOG_SPACE_FIRST_ID);
  	}
  
@@ -193,7 +193,7 @@
  
  	if (success) {
  		*space_id = fil_system->max_assigned_id = id;
-@@ -1600,6 +1601,8 @@
+@@ -1601,6 +1602,8 @@
  	UT_LIST_INIT(fil_system->LRU);
  
  	fil_system->max_n_open = max_n_open;
@@ -202,7 +202,7 @@
  }
  
  /*******************************************************************//**
-@@ -1621,7 +1624,7 @@
+@@ -1622,7 +1625,7 @@
  	space = UT_LIST_GET_FIRST(fil_system->space_list);
  
  	while (space != NULL) {
@@ -211,7 +211,7 @@
  			node = UT_LIST_GET_FIRST(space->chain);
  
  			while (node != NULL) {
-@@ -1711,6 +1714,10 @@
+@@ -1712,6 +1715,10 @@
  		ut_error;
  	}
  
@@ -222,7 +222,7 @@
  	mutex_enter(&fil_system->mutex);
  
  	if (fil_system->max_assigned_id < max_id) {
-@@ -1729,6 +1736,7 @@
+@@ -1730,6 +1737,7 @@
  ulint
  fil_write_lsn_and_arch_no_to_file(
  /*==============================*/
@@ -230,7 +230,7 @@
  	ulint		sum_of_sizes,	/*!< in: combined size of previous files
  					in space, in database pages */
  	ib_uint64_t	lsn,		/*!< in: lsn to write */
-@@ -1738,14 +1746,16 @@
+@@ -1739,14 +1747,16 @@
  	byte*	buf1;
  	byte*	buf;
  
@@ -249,7 +249,7 @@
  
  	mem_free(buf1);
  
-@@ -1781,7 +1791,7 @@
+@@ -1782,7 +1792,7 @@
  		always open. */
  
  		if (space->purpose == FIL_TABLESPACE
@@ -258,7 +258,7 @@
  			sum_of_sizes = 0;
  
  			node = UT_LIST_GET_FIRST(space->chain);
-@@ -1789,7 +1799,7 @@
+@@ -1790,7 +1800,7 @@
  				mutex_exit(&fil_system->mutex);
  
  				err = fil_write_lsn_and_arch_no_to_file(
@@ -267,7 +267,7 @@
  				if (err != DB_SUCCESS) {
  
  					return(err);
-@@ -4158,7 +4168,7 @@
+@@ -4159,7 +4169,7 @@
  	}
  
  #ifndef UNIV_HOTBACKUP
@@ -276,7 +276,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace id %lu in file %s"
  			" is not sensible\n",
-@@ -4167,7 +4177,7 @@
+@@ -4168,7 +4178,7 @@
  		goto func_exit;
  	}
  #else
@@ -285,7 +285,7 @@
  		char*	new_path;
  
  		fprintf(stderr,
-@@ -4988,7 +4998,7 @@
+@@ -4989,7 +4999,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
@@ -294,7 +294,7 @@
  		/* The node is in the LRU list, remove it */
  
  		ut_a(UT_LIST_GET_LEN(system->LRU) > 0);
-@@ -5034,7 +5044,7 @@
+@@ -5035,7 +5045,7 @@
  	}
  
  	if (node->n_pending == 0 && node->space->purpose == FIL_TABLESPACE
@@ -303,7 +303,7 @@
  		/* The node must be put back to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
-@@ -5645,7 +5655,7 @@
+@@ -5646,7 +5656,7 @@
  		ut_a(fil_node->n_pending == 0);
  		ut_a(fil_node->open);
  		ut_a(fil_node->space->purpose == FIL_TABLESPACE);
@@ -348,7 +348,7 @@
  
  /* The highest file format being used in the database. The value can be
  set by user, however, it will be adjusted to the newer file format if
-@@ -2472,6 +2473,8 @@
+@@ -2478,6 +2479,8 @@
  		goto error;
  	}
  
@@ -357,7 +357,7 @@
  	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
  
  	/* -------------- Log files ---------------------------*/
-@@ -11641,6 +11644,11 @@
+@@ -11658,6 +11661,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -369,7 +369,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:               "
-@@ -11808,6 +11816,7 @@
+@@ -11825,6 +11833,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
@@ -519,7 +519,7 @@
 diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
 --- a/storage/innobase/row/row0mysql.c	2010-12-03 17:30:16.334989510 +0900
 +++ b/storage/innobase/row/row0mysql.c	2010-12-04 15:35:58.652496484 +0900
-@@ -3447,7 +3447,7 @@
+@@ -3452,7 +3452,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
  

=== modified file 'innodb_show_lock_name.patch'
--- innodb_show_lock_name.patch	2011-06-10 10:07:06 +0000
+++ innodb_show_lock_name.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:34:35.285040381 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:35:12.974975252 +0900
-@@ -9593,9 +9593,8 @@
+@@ -9605,9 +9605,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
  #else /* UNIV_DEBUG */
@@ -20,7 +20,7 @@
  		buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
  				     (ulong) mutex->count_os_wait);
  
-@@ -9610,10 +9609,8 @@
+@@ -9622,10 +9621,8 @@
  
  	if (block_mutex) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -33,7 +33,7 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_mutex_oswait_count);
-@@ -9642,9 +9639,8 @@
+@@ -9654,9 +9651,8 @@
  			continue;
  		}
  
@@ -45,7 +45,7 @@
  		buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
  				      (ulong) lock->count_os_wait);
  
-@@ -9658,10 +9654,8 @@
+@@ -9670,10 +9666,8 @@
  
  	if (block_lock) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,

=== modified file 'innodb_show_status.patch'
--- innodb_show_status.patch	2011-06-10 10:07:06 +0000
+++ innodb_show_status.patch	2011-08-01 03:32:34 +0000
@@ -62,7 +62,7 @@
 diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
 --- a/storage/innobase/fil/fil0fil.c	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/fil/fil0fil.c	2010-12-03 15:07:31.790357112 +0900
-@@ -4888,3 +4888,30 @@
+@@ -4889,3 +4889,30 @@
  
  	fil_system = NULL;
  }
@@ -96,7 +96,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:06:58.727955654 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:07:31.799376984 +0900
-@@ -603,6 +603,8 @@
+@@ -604,6 +604,8 @@
    (char*) &export_vars.innodb_buffer_pool_pages_dirty,	  SHOW_LONG},
    {"buffer_pool_pages_flushed",
    (char*) &export_vars.innodb_buffer_pool_pages_flushed,  SHOW_LONG},
@@ -105,7 +105,7 @@
    {"buffer_pool_pages_free",
    (char*) &export_vars.innodb_buffer_pool_pages_free,	  SHOW_LONG},
  #ifdef UNIV_DEBUG
-@@ -11081,6 +11083,16 @@
+@@ -11098,6 +11100,16 @@
    "Force InnoDB to not use next-key locking, to use only row-level locking.",
    NULL, NULL, FALSE);
  
@@ -122,7 +122,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11268,7 +11280,7 @@
+@@ -11285,7 +11297,7 @@
  
  static MYSQL_SYSVAR_STR(version, innodb_version_str,
    PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
@@ -131,7 +131,7 @@
  
  static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11361,6 +11373,8 @@
+@@ -11379,6 +11391,8 @@
    MYSQL_SYSVAR(thread_concurrency),
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),
@@ -143,7 +143,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2011-01-20 07:37:08.000000000 +0900
 +++ b/storage/innobase/include/buf0buf.h	2011-02-14 15:25:20.859126532 +0900
-@@ -125,6 +125,7 @@
+@@ -128,6 +128,7 @@
  	/* General buffer pool info */
  	ulint	pool_unique_id;		/*!< Buffer Pool ID */
  	ulint	pool_size;		/*!< Buffer Pool size in pages */
@@ -216,7 +216,7 @@
 diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
 --- a/storage/innobase/lock/lock0lock.c	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/lock/lock0lock.c	2010-12-03 15:07:31.819023998 +0900
-@@ -4374,6 +4374,7 @@
+@@ -4377,6 +4377,7 @@
  
  	putc('\n', file);
  
@@ -224,7 +224,7 @@
  	block = buf_page_try_get(space, page_no, &mtr);
  
  	for (i = 0; i < lock_rec_get_n_bits(lock); ++i) {
-@@ -4400,6 +4401,7 @@
+@@ -4403,6 +4404,7 @@
  
  		putc('\n', file);
  	}
@@ -232,7 +232,7 @@
  
  	mtr_commit(&mtr);
  	if (UNIV_LIKELY_NULL(heap)) {
-@@ -4583,7 +4585,7 @@
+@@ -4586,7 +4588,7 @@
  		}
  	}
  
@@ -241,7 +241,7 @@
  		nth_trx++;
  		goto loop;
  	}
-@@ -4655,8 +4657,8 @@
+@@ -4658,8 +4660,8 @@
  
  	nth_lock++;
  

=== modified file 'innodb_show_status_extend.patch'
--- innodb_show_status_extend.patch	2011-06-21 06:10:10 +0000
+++ innodb_show_status_extend.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2011-01-21 19:53:42.369599743 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2011-01-21 19:54:44.659599699 +0900
-@@ -638,6 +638,16 @@
+@@ -639,6 +639,16 @@
  	trx_t*	trx);	/*!< in: transaction handle */
  
  static SHOW_VAR innodb_status_variables[]= {
@@ -25,7 +25,7 @@
    {"buffer_pool_pages_data",
    (char*) &export_vars.innodb_buffer_pool_pages_data,	  SHOW_LONG},
    {"buffer_pool_pages_dirty",
-@@ -652,8 +662,14 @@
+@@ -653,8 +663,14 @@
    {"buffer_pool_pages_latched",
    (char*) &export_vars.innodb_buffer_pool_pages_latched,  SHOW_LONG},
  #endif /* UNIV_DEBUG */
@@ -40,7 +40,7 @@
    {"buffer_pool_pages_total",
    (char*) &export_vars.innodb_buffer_pool_pages_total,	  SHOW_LONG},
    {"buffer_pool_read_ahead",
-@@ -668,6 +684,12 @@
+@@ -669,6 +685,12 @@
    (char*) &export_vars.innodb_buffer_pool_wait_free,	  SHOW_LONG},
    {"buffer_pool_write_requests",
    (char*) &export_vars.innodb_buffer_pool_write_requests, SHOW_LONG},
@@ -53,7 +53,7 @@
    {"data_fsyncs",
    (char*) &export_vars.innodb_data_fsyncs,		  SHOW_LONG},
    {"data_pending_fsyncs",
-@@ -694,12 +716,66 @@
+@@ -695,12 +717,66 @@
    (char*) &export_vars.innodb_dict_tables,		  SHOW_LONG},
    {"have_atomic_builtins",
    (char*) &export_vars.innodb_have_atomic_builtins,	  SHOW_BOOL},
@@ -120,7 +120,7 @@
    {"os_log_fsyncs",
    (char*) &export_vars.innodb_os_log_fsyncs,		  SHOW_LONG},
    {"os_log_pending_fsyncs",
-@@ -716,8 +792,14 @@
+@@ -717,8 +793,14 @@
    (char*) &export_vars.innodb_pages_read,		  SHOW_LONG},
    {"pages_written",
    (char*) &export_vars.innodb_pages_written,		  SHOW_LONG},
@@ -135,7 +135,7 @@
    {"row_lock_time",
    (char*) &export_vars.innodb_row_lock_time,		  SHOW_LONGLONG},
    {"row_lock_time_avg",
-@@ -734,8 +816,20 @@
+@@ -735,8 +817,20 @@
    (char*) &export_vars.innodb_rows_read,		  SHOW_LONG},
    {"rows_updated",
    (char*) &export_vars.innodb_rows_updated,		  SHOW_LONG},
@@ -234,7 +234,7 @@
 diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
 --- a/storage/innobase/include/lock0lock.h	2011-01-21 19:52:38.967683738 +0900
 +++ b/storage/innobase/include/lock0lock.h	2011-01-21 19:54:44.660599140 +0900
-@@ -816,6 +816,7 @@
+@@ -817,6 +817,7 @@
  /** The lock system struct */
  struct lock_sys_struct{
  	hash_table_t*	rec_hash;	/*!< hash table of the record locks */
@@ -356,7 +356,7 @@
 diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
 --- a/storage/innobase/lock/lock0lock.c	2011-01-21 19:52:38.998600121 +0900
 +++ b/storage/innobase/lock/lock0lock.c	2011-01-21 19:54:44.668637536 +0900
-@@ -571,6 +571,7 @@
+@@ -569,6 +569,7 @@
  	lock_sys = mem_alloc(sizeof(lock_sys_t));
  
  	lock_sys->rec_hash = hash_create(n_cells);
@@ -364,7 +364,7 @@
  
  	/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
  
-@@ -1719,6 +1720,7 @@
+@@ -1729,6 +1730,7 @@
  
  	HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
  		    lock_rec_fold(space, page_no), lock);
@@ -372,7 +372,7 @@
  	if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
  
  		lock_set_lock_and_trx_wait(lock, trx);
-@@ -2265,6 +2267,7 @@
+@@ -2275,6 +2277,7 @@
  
  	HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
  		    lock_rec_fold(space, page_no), in_lock);
@@ -380,7 +380,7 @@
  
  	UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
  
-@@ -2308,6 +2311,7 @@
+@@ -2318,6 +2321,7 @@
  
  	HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
  		    lock_rec_fold(space, page_no), in_lock);

=== modified file 'innodb_show_sys_tables.patch'
--- innodb_show_sys_tables.patch	2011-06-10 10:07:06 +0000
+++ innodb_show_sys_tables.patch	2011-08-01 03:32:34 +0000
@@ -41,7 +41,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:53:54.615040167 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 16:07:26.851357007 +0900
-@@ -11772,7 +11772,14 @@
+@@ -11790,7 +11790,14 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,

=== modified file 'innodb_split_buf_pool_mutex.patch'
--- innodb_split_buf_pool_mutex.patch	2011-06-27 07:12:14 +0000
+++ innodb_split_buf_pool_mutex.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
 --- a/storage/innobase/btr/btr0cur.c	2010-11-03 07:01:13.000000000 +0900
 +++ b/storage/innobase/btr/btr0cur.c	2010-12-03 15:48:29.268957148 +0900
-@@ -4069,7 +4069,8 @@
+@@ -4081,7 +4081,8 @@
  
  	mtr_commit(mtr);
  
@@ -18,7 +18,7 @@
  	mutex_enter(&block->mutex);
  
  	/* Only free the block if it is still allocated to
-@@ -4080,16 +4081,21 @@
+@@ -4092,16 +4093,21 @@
  	    && buf_block_get_space(block) == space
  	    && buf_block_get_page_no(block) == page_no) {
  
@@ -1168,7 +1168,7 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
  	ut_ad(mtr);
-@@ -2765,9 +2879,11 @@
+@@ -2766,9 +2880,11 @@
  	fold = buf_page_address_fold(space, offset);
  loop:
  	block = guess;
@@ -1181,7 +1181,7 @@
  		/* If the guess is a compressed page descriptor that
  		has been allocated by buf_buddy_alloc(), it may have
  		been invalidated by buf_buddy_relocate().  In that
-@@ -2776,11 +2892,15 @@
+@@ -2777,11 +2893,15 @@
  		the guess may be pointing to a buffer pool chunk that
  		has been released when resizing the buffer pool. */
  
@@ -1198,7 +1198,7 @@
  			block = guess = NULL;
  		} else {
  			ut_ad(!block->page.in_zip_hash);
-@@ -2789,12 +2909,19 @@
+@@ -2790,12 +2910,19 @@
  	}
  
  	if (block == NULL) {
@@ -1218,7 +1218,7 @@
  		block = NULL;
  	}
  
-@@ -2806,12 +2933,14 @@
+@@ -2807,12 +2934,14 @@
  				space, offset, fold);
  
  			if (UNIV_LIKELY_NULL(block)) {
@@ -1235,7 +1235,7 @@
  
  		if (mode == BUF_GET_IF_IN_POOL
  		    || mode == BUF_PEEK_IF_IN_POOL
-@@ -2861,7 +2990,8 @@
+@@ -2862,7 +2991,8 @@
  		/* The page is being read to buffer pool,
  		but we cannot wait around for the read to
  		complete. */
@@ -1245,7 +1245,7 @@
  
  		return(NULL);
  	}
-@@ -2871,38 +3001,49 @@
+@@ -2872,38 +3002,49 @@
  		ibool		success;
  
  	case BUF_BLOCK_FILE_PAGE:
@@ -1302,7 +1302,7 @@
  
  		{
  			buf_page_t*	hash_bpage;
-@@ -2915,35 +3056,47 @@
+@@ -2916,35 +3057,47 @@
  				while buf_pool->mutex was released.
  				Free the block that was allocated. */
  
@@ -1356,7 +1356,7 @@
  		buf_block_init_low(block);
  		block->lock_hash_val = lock_rec_hash(space, offset);
  
-@@ -2952,7 +3105,7 @@
+@@ -2953,7 +3106,7 @@
  
  		if (buf_page_get_state(&block->page)
  		    == BUF_BLOCK_ZIP_PAGE) {
@@ -1365,7 +1365,7 @@
  				       &block->page);
  			ut_ad(!block->page.in_flush_list);
  		} else {
-@@ -2969,20 +3122,25 @@
+@@ -2970,20 +3123,25 @@
  		/* Insert at the front of unzip_LRU list */
  		buf_unzip_LRU_add_block(block, FALSE);
  
@@ -1394,7 +1394,7 @@
  
  		/* Decompress the page and apply buffered operations
  		while not holding buf_pool->mutex or block->mutex. */
-@@ -2995,12 +3153,15 @@
+@@ -2996,12 +3154,15 @@
  		}
  
  		/* Unfix and unlatch the block. */
@@ -1413,7 +1413,7 @@
  		rw_lock_x_unlock(&block->lock);
  
  		break;
-@@ -3016,7 +3177,7 @@
+@@ -3017,7 +3178,7 @@
  
  	ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
  
@@ -1422,7 +1422,7 @@
  #if UNIV_WORD_SIZE == 4
  	/* On 32-bit systems, there is no padding in buf_page_t.  On
  	other systems, Valgrind could complain about uninitialized pad
-@@ -3029,8 +3190,8 @@
+@@ -3030,8 +3191,8 @@
  		/* Try to evict the block from the buffer pool, to use the
  		insert buffer (change buffer) as much as possible. */
  
@@ -1433,7 +1433,7 @@
  			if (mode == BUF_GET_IF_IN_POOL_OR_WATCH) {
  				/* Set the watch, as it would have
  				been set if the page were not in the
-@@ -3039,6 +3200,9 @@
+@@ -3040,6 +3201,9 @@
  					space, offset, fold);
  
  				if (UNIV_LIKELY_NULL(block)) {
@@ -1443,7 +1443,7 @@
  
  					/* The page entered the buffer
  					pool for some reason. Try to
-@@ -3046,7 +3210,7 @@
+@@ -3047,7 +3211,7 @@
  					goto got_block;
  				}
  			}
@@ -1452,10 +1452,10 @@
  			fprintf(stderr,
  				"innodb_change_buffering_debug evict %u %u\n",
  				(unsigned) space, (unsigned) offset);
-@@ -3065,13 +3229,14 @@
- 
- 	buf_block_buf_fix_inc(block, file, line);
- 
+@@ -3069,13 +3233,14 @@
+ 	ut_a(mode == BUF_GET_POSSIBLY_FREED
+ 	     || !block->page.file_page_was_freed);
+ #endif
 -	mutex_exit(&block->mutex);
 +	//mutex_exit(&block->mutex);
  
@@ -3382,7 +3382,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:48:03.048955897 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:48:29.304024564 +0900
-@@ -264,6 +264,10 @@
+@@ -265,6 +265,10 @@
  #  endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */
  	{&buf_pool_mutex_key, "buf_pool_mutex", 0},
  	{&buf_pool_zip_mutex_key, "buf_pool_zip_mutex", 0},
@@ -3393,7 +3393,7 @@
  	{&cache_last_read_mutex_key, "cache_last_read_mutex", 0},
  	{&dict_foreign_err_mutex_key, "dict_foreign_err_mutex", 0},
  	{&dict_sys_mutex_key, "dict_sys_mutex", 0},
-@@ -313,6 +317,7 @@
+@@ -314,6 +318,7 @@
  	{&archive_lock_key, "archive_lock", 0},
  #  endif /* UNIV_LOG_ARCHIVE */
  	{&btr_search_latch_key, "btr_search_latch", 0},
@@ -3547,7 +3547,7 @@
 diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
 --- a/storage/innobase/include/buf0buf.h	2010-12-03 15:22:36.327954660 +0900
 +++ b/storage/innobase/include/buf0buf.h	2010-12-03 15:48:29.343024683 +0900
-@@ -205,6 +205,20 @@
+@@ -208,6 +208,20 @@
  /*==========================*/
  
  /********************************************************************//**
@@ -3568,7 +3568,7 @@
  Creates the buffer pool.
  @return	own: buf_pool object, NULL if not enough memory or error */
  UNIV_INTERN
-@@ -834,6 +848,15 @@
+@@ -837,6 +851,15 @@
  	const buf_page_t*	bpage)	/*!< in: pointer to control block */
  	__attribute__((pure));
  
@@ -3584,7 +3584,7 @@
  /*********************************************************************//**
  Get the flush type of a page.
  @return	flush type */
-@@ -1315,7 +1338,7 @@
+@@ -1318,7 +1341,7 @@
  	All these are protected by buf_pool->mutex. */
  	/* @{ */
  
@@ -3593,7 +3593,7 @@
  					/*!< based on state, this is a
  					list node, protected either by
  					buf_pool->mutex or by
-@@ -1343,6 +1366,10 @@
+@@ -1346,6 +1369,10 @@
  					BUF_BLOCK_REMOVE_HASH or
  					BUF_BLOCK_READY_IN_USE. */
  
@@ -3604,7 +3604,7 @@
  #ifdef UNIV_DEBUG
  	ibool		in_flush_list;	/*!< TRUE if in buf_pool->flush_list;
  					when buf_pool->flush_list_mutex is
-@@ -1435,11 +1462,11 @@
+@@ -1438,11 +1465,11 @@
  					a block is in the unzip_LRU list
  					if page.state == BUF_BLOCK_FILE_PAGE
  					and page.zip.data != NULL */
@@ -3618,7 +3618,7 @@
  	mutex_t		mutex;		/*!< mutex protecting this block:
  					state (also protected by the buffer
  					pool mutex), io_fix, buf_fix_count,
-@@ -1614,6 +1641,11 @@
+@@ -1617,6 +1644,11 @@
  					pool instance, protects compressed
  					only pages (of type buf_page_t, not
  					buf_block_t */
@@ -3630,7 +3630,7 @@
  	ulint		instance_no;	/*!< Array index of this buffer
  					pool instance */
  	ulint		old_pool_size;  /*!< Old pool size in bytes */
-@@ -1765,8 +1797,8 @@
+@@ -1768,8 +1800,8 @@
  /** Test if a buffer pool mutex is owned. */
  #define buf_pool_mutex_own(b) mutex_own(&b->mutex)
  /** Acquire a buffer pool mutex. */

=== modified file 'innodb_stats.patch'
--- innodb_stats.patch	2011-06-10 10:07:06 +0000
+++ innodb_stats.patch	2011-08-01 03:32:34 +0000
@@ -189,7 +189,7 @@
  Creates an index tree for the index if it is not a member of a cluster.
  @return	DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
  static
-@@ -937,6 +1008,49 @@
+@@ -936,6 +1007,49 @@
  					  dict_sys->sys_fields, heap);
  	node->field_def->common.parent = node;
  
@@ -239,7 +239,7 @@
  	node->commit_node = commit_node_create(heap);
  	node->commit_node->common.parent = node;
  
-@@ -1087,6 +1201,7 @@
+@@ -1086,6 +1200,7 @@
  
  		node->state = INDEX_BUILD_FIELD_DEF;
  		node->field_no = 0;
@@ -247,7 +247,7 @@
  
  		thr->run_node = node->ind_def;
  
-@@ -1132,7 +1247,31 @@
+@@ -1131,7 +1246,31 @@
  			goto function_exit;
  		}
  
@@ -280,7 +280,7 @@
  	}
  
  	if (node->state == INDEX_CREATE_INDEX_TREE) {
-@@ -1178,6 +1317,66 @@
+@@ -1177,6 +1316,66 @@
  		return(NULL);
  	}
  
@@ -359,7 +359,7 @@
  	}
  
  	return(table);
-@@ -4309,6 +4309,295 @@
+@@ -4343,6 +4343,295 @@
  }
  
  /*********************************************************************//**
@@ -655,7 +655,7 @@
  Calculates new estimates for table and index statistics. The statistics
  are used in query optimization. */
  UNIV_INTERN
-@@ -4316,10 +4605,11 @@
+@@ -4350,10 +4639,11 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -668,7 +668,7 @@
  {
  	dict_index_t*	index;
  	ulint		sum_of_index_sizes	= 0;
-@@ -4336,6 +4626,27 @@
+@@ -4370,6 +4660,27 @@
  		return;
  	}
  
@@ -696,7 +696,7 @@
  	/* Find out the sizes of the indexes and how many different values
  	for the key they approximately have */
  
-@@ -4400,6 +4711,11 @@
+@@ -4434,6 +4745,11 @@
  		index = dict_table_get_next_index(index);
  	} while (index);
  
@@ -708,7 +708,7 @@
  	index = dict_table_get_first_index(table);
  
  	table->stat_n_rows = index->stat_n_diff_key_vals[
-@@ -4417,6 +4733,78 @@
+@@ -4451,6 +4767,78 @@
  	dict_table_stats_unlock(table, RW_X_LATCH);
  }
  
@@ -787,7 +787,7 @@
  /**********************************************************************//**
  Prints info of a foreign key constraint. */
  static
-@@ -4494,7 +4882,8 @@
+@@ -4528,7 +4916,8 @@
  
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -904,15 +904,15 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:17:03.665960357 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:22:21.586939783 +0900
-@@ -187,6 +187,7 @@
- static my_bool	innobase_rollback_on_timeout		= FALSE;
+@@ -188,6 +188,7 @@
  static my_bool	innobase_create_status_file		= FALSE;
  static my_bool	innobase_stats_on_metadata		= TRUE;
+ static my_bool	innobase_large_prefix			= FALSE;
 +static my_bool	innobase_use_sys_stats_table		= FALSE;
  
  
  static char*	internal_innobase_data_file_path	= NULL;
-@@ -2434,6 +2435,8 @@
+@@ -2440,6 +2441,8 @@
  		goto error;
  	}
  
@@ -921,7 +921,7 @@
  	/* -------------- Log files ---------------------------*/
  
  	/* The default dir for log files is the datadir of MySQL */
-@@ -5236,6 +5239,10 @@
+@@ -5248,6 +5251,10 @@
  
  	error = row_insert_for_mysql((byte*) record, prebuilt);
  
@@ -932,7 +932,7 @@
  	/* Handle duplicate key errors */
  	if (auto_inc_used) {
  		ulint		err;
-@@ -5572,6 +5579,10 @@
+@@ -5584,6 +5591,10 @@
  		}
  	}
  
@@ -943,7 +943,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(error,
-@@ -5625,6 +5636,10 @@
+@@ -5637,6 +5648,10 @@
  
  	error = row_update_for_mysql((byte*) record, prebuilt);
  
@@ -954,7 +954,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(
-@@ -5943,6 +5958,11 @@
+@@ -5955,6 +5970,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -966,7 +966,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_KEY_NOT_FOUND;
-@@ -6152,6 +6172,11 @@
+@@ -6164,6 +6184,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -978,7 +978,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_END_OF_FILE;
-@@ -8094,11 +8119,35 @@
+@@ -8106,11 +8131,35 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
@@ -1015,7 +1015,7 @@
  
  			prebuilt->trx->op_info = "returning various info to MySQL";
  		}
-@@ -8176,7 +8225,7 @@
+@@ -8188,7 +8237,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. */
@@ -1024,7 +1024,7 @@
  		    || !(flag & HA_STATUS_VARIABLE_EXTRA)) {
  			/* We do not update delete_length if no
  			locking is requested so the "old" value can
-@@ -11385,6 +11434,26 @@
+@@ -11402,6 +11451,26 @@
    "The number of index pages to sample when calculating statistics (default 8)",
    NULL, NULL, 8, 1, ~0ULL, 0);
  
@@ -1051,7 +1051,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
    PLUGIN_VAR_OPCMDARG,
    "Enable InnoDB adaptive hash index (enabled by default).  "
-@@ -11710,6 +11779,9 @@
+@@ -11728,6 +11797,9 @@
    MYSQL_SYSVAR(recovery_update_relay_log),
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
@@ -1061,7 +1061,7 @@
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
    MYSQL_SYSVAR(stats_method),
-@@ -11779,7 +11851,10 @@
+@@ -11797,7 +11869,10 @@
  i_s_innodb_sys_columns,
  i_s_innodb_sys_fields,
  i_s_innodb_sys_foreign,
@@ -1767,7 +1767,7 @@
 diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
 --- a/storage/innobase/include/dict0dict.h	2010-12-03 15:48:03.073024387 +0900
 +++ b/storage/innobase/include/dict0dict.h	2010-12-03 17:19:24.888965622 +0900
-@@ -1096,10 +1096,18 @@
+@@ -1109,10 +1109,18 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -1787,7 +1787,7 @@
  /********************************************************************//**
  Reserves the dictionary system mutex for MySQL. */
  UNIV_INTERN
-@@ -1214,6 +1222,7 @@
+@@ -1227,6 +1235,7 @@
  	dict_table_t*	sys_columns;	/*!< SYS_COLUMNS table */
  	dict_table_t*	sys_indexes;	/*!< SYS_INDEXES table */
  	dict_table_t*	sys_fields;	/*!< SYS_FIELDS table */
@@ -1806,7 +1806,7 @@
  
  	/* This must be last item. Defines the number of system tables. */
  	SYS_NUM_SYSTEM_TABLES
-@@ -322,6 +323,20 @@
+@@ -327,6 +328,20 @@
  	const char**	ref_col_name,	/*!< out: referenced column name
  					in referenced table */
  	ulint*		pos);		/*!< out: column position */
@@ -1967,7 +1967,7 @@
  	}
  }
  
-@@ -2098,6 +2101,71 @@
+@@ -2103,6 +2106,71 @@
  }
  
  /*********************************************************************//**
@@ -2039,7 +2039,7 @@
  Scans a table create SQL string and adds to the data dictionary
  the foreign key constraints declared in the string. This function
  should be called after the indexes for a table have been created.
-@@ -3022,7 +3090,7 @@
+@@ -3027,7 +3095,7 @@
  	dict_table_autoinc_initialize(table, 1);
  	dict_table_autoinc_unlock(table);
  	dict_update_statistics(table, FALSE /* update even if stats are
@@ -2048,7 +2048,7 @@
  
  	trx_commit_for_mysql(trx);
  
-@@ -3324,6 +3392,8 @@
+@@ -3329,6 +3397,8 @@
  			   "       IF (SQL % NOTFOUND) THEN\n"
  			   "               found := 0;\n"
  			   "       ELSE\n"
@@ -2060,7 +2060,7 @@
 diff -ruN a/storage/innobase/row/row0row.c b/storage/innobase/row/row0row.c
 --- a/storage/innobase/row/row0row.c	2011-03-10 00:11:38.000000000 +0900
 +++ b/storage/innobase/row/row0row.c	2011-03-30 11:44:58.000000000 +0900
-@@ -347,6 +347,14 @@
+@@ -315,6 +315,14 @@
  
  	rec_len = rec_offs_n_fields(offsets);
  
@@ -2075,7 +2075,7 @@
  	entry = dtuple_create(heap, rec_len);
  
  	dtuple_set_n_fields_cmp(entry,
-@@ -358,6 +366,14 @@
+@@ -326,6 +334,14 @@
  	for (i = 0; i < rec_len; i++) {
  
  		dfield = dtuple_get_nth_field(entry, i);
@@ -2141,12 +2141,12 @@
 diff -ruN a/storage/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c
 --- a/storage/innobase/trx/trx0rec.c	2011-03-10 00:11:38.000000000 +0900
 +++ b/storage/innobase/trx/trx0rec.c	2011-03-30 11:44:58.000000000 +0900
-@@ -665,14 +665,27 @@
+@@ -669,15 +669,27 @@
  	/* Save to the undo log the old values of the columns to be updated. */
  
  	if (update) {
 +		ulint	extended = 0;
-+
+ 
  		if (trx_undo_left(undo_page, ptr) < 5) {
  
  			return(0);

=== modified file 'innodb_thread_concurrency_timer_based.patch'
--- innodb_thread_concurrency_timer_based.patch	2011-06-10 10:07:06 +0000
+++ innodb_thread_concurrency_timer_based.patch	2011-08-01 03:32:34 +0000
@@ -16,7 +16,7 @@
  static long long innobase_buffer_pool_size, innobase_log_file_size;
  
  /** Percentage of the buffer pool to reserve for 'old' blocks.
-@@ -2543,6 +2544,9 @@
+@@ -2549,6 +2550,9 @@
  	srv_n_log_files = (ulint) innobase_log_files_in_group;
  	srv_log_file_size = (ulint) innobase_log_file_size;
  
@@ -26,7 +26,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  	srv_log_archive_on = (ulint) innobase_log_archive;
  #endif /* UNIV_LOG_ARCHIVE */
-@@ -11475,6 +11479,12 @@
+@@ -11492,6 +11496,12 @@
    "Maximum delay between polling for a spin lock (6 by default)",
    NULL, NULL, 6L, 0L, ~0L, 0);
  
@@ -39,7 +39,7 @@
  static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.",
-@@ -11686,6 +11696,7 @@
+@@ -11704,6 +11714,7 @@
    MYSQL_SYSVAR(spin_wait_delay),
    MYSQL_SYSVAR(table_locks),
    MYSQL_SYSVAR(thread_concurrency),

=== modified file 'log_connection_error.patch'
--- log_connection_error.patch	2011-06-16 01:19:11 +0000
+++ log_connection_error.patch	2011-08-01 03:32:34 +0000
@@ -18,7 +18,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2011-04-09 18:48:53.000000000 +0400
 +++ b/sql/mysqld.cc	2011-04-09 18:48:54.000000000 +0400
-@@ -5040,6 +5040,10 @@
+@@ -5098,6 +5098,10 @@
  
      DBUG_PRINT("error",("Too many connections"));
      close_connection(thd, ER_CON_COUNT_ERROR);
@@ -29,7 +29,7 @@
      delete thd;
      DBUG_VOID_RETURN;
    }
-@@ -5420,6 +5424,10 @@
+@@ -5478,6 +5482,10 @@
      if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
  	my_net_init(&thd->net, thd->net.vio))
      {
@@ -40,7 +40,7 @@
        close_connection(thd, ER_OUT_OF_RESOURCES);
        delete thd;
        continue;
-@@ -5615,6 +5623,10 @@
+@@ -5673,6 +5681,10 @@
                                                     event_conn_closed)) ||
                          my_net_init(&thd->net, thd->net.vio))
      {

=== modified file 'log_warnings_suppress.patch'
--- log_warnings_suppress.patch	2011-06-16 01:19:11 +0000
+++ log_warnings_suppress.patch	2011-08-01 03:32:34 +0000
@@ -21,7 +21,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2011-04-09 18:48:59.000000000 +0400
 +++ b/sql/mysqld.cc	2011-04-09 18:48:59.000000000 +0400
-@@ -623,6 +623,8 @@
+@@ -628,6 +628,8 @@
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_profiling;
  
@@ -39,13 +39,13 @@
  
 +extern ulonglong opt_log_warnings_suppress;
 +
- extern pthread_key(MEM_ROOT**,THR_MALLOC);
- 
- #ifdef HAVE_PSI_INTERFACE
+ /*
+   THR_MALLOC is a key which will be used to set/get MEM_ROOT** for a thread,
+   using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr().
 diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
 --- a/sql/sql_class.cc	2011-04-09 18:48:50.000000000 +0400
 +++ b/sql/sql_class.cc	2011-04-09 18:48:59.000000000 +0400
-@@ -4575,7 +4575,7 @@
+@@ -4864,7 +4864,7 @@
                            ER_BINLOG_UNSAFE_STATEMENT,
                            ER(ER_BINLOG_UNSAFE_STATEMENT),
                            ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));

=== modified file 'microsec_process.patch'
--- microsec_process.patch	2011-06-10 10:07:06 +0000
+++ microsec_process.patch	2011-08-01 03:32:34 +0000
@@ -41,7 +41,7 @@
        if (schema_table_store_record(thd, table))
        {
          mysql_mutex_unlock(&LOCK_thread_count);
-@@ -7409,6 +7414,8 @@
+@@ -7441,6 +7446,8 @@
    {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE},
    {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info",
     SKIP_OPEN_TABLE},

=== modified file 'mysql-test.diff'
--- mysql-test.diff	2011-05-18 00:03:53 +0000
+++ mysql-test.diff	2011-08-01 03:32:34 +0000
@@ -1342,3 +1342,22 @@
 +++ b/mysql-test/suite/sys_vars/t/userstat_basic.test	2011-04-09 18:49:05.000000000 +0400
 @@ -0,0 +1 @@
 +SELECT @@global.userstat;
+diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
+--- a/mysql-test/suite/sys_vars/r/all_vars.result	2011-06-21 19:42:40.000000000 +0300
++++ b/mysql-test/suite/sys_vars/r/all_vars.result	2011-07-27 23:04:47.504793666 +0300
+@@ -12,11 +12,15 @@
+ left join t1 on variable_name=test_name where test_name is null;
+ There should be *no* variables listed below:
+ INNODB_ROLLBACK_SEGMENTS
++INNODB_KILL_IDLE_TRANSACTION
+ INNODB_STATS_METHOD
++INNODB_FAKE_CHANGES
+ INNODB_FILE_FORMAT_MAX
+ INNODB_LARGE_PREFIX
+ INNODB_ROLLBACK_SEGMENTS
++INNODB_KILL_IDLE_TRANSACTION
+ INNODB_STATS_METHOD
++INNODB_FAKE_CHANGES
+ INNODB_FILE_FORMAT_MAX
+ INNODB_LARGE_PREFIX
+ drop table t1;

=== modified file 'mysql_syslog.patch'
--- mysql_syslog.patch	2011-05-11 13:27:33 +0000
+++ mysql_syslog.patch	2011-08-01 03:32:34 +0000
@@ -59,7 +59,7 @@
 +   NO_ARG, 0, 0, 0, 0, 0, 0},
 +#endif
    {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
-    (uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
+     &opt_plugin_dir, &opt_plugin_dir, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 @@ -1667,6 +1677,11 @@
                                      opt->name);

=== modified file 'optimizer_fix.patch'
--- optimizer_fix.patch	2011-06-10 10:07:06 +0000
+++ optimizer_fix.patch	2011-08-01 03:32:34 +0000
@@ -20,8 +20,8 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-12-02 19:22:40.027024953 +0900
 +++ b/sql/mysqld.cc	2010-12-02 20:51:50.811356434 +0900
-@@ -425,6 +425,7 @@
- uint    opt_debug_sync_timeout= 0;
+@@ -430,6 +430,7 @@
+ MYSQL_PLUGIN_IMPORT uint    opt_debug_sync_timeout= 0;
  #endif /* defined(ENABLED_DEBUG_SYNC) */
  my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
 +my_bool opt_optimizer_fix= 0;

=== modified file 'processlist_row_stats.patch'
--- processlist_row_stats.patch	2011-06-16 01:19:11 +0000
+++ processlist_row_stats.patch	2011-08-01 03:32:34 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
 --- a/sql/sql_class.cc	2011-03-09 17:07:26.221709282 +0200
 +++ b/sql/sql_class.cc	2011-03-09 17:07:44.900164285 +0200
-@@ -2017,6 +2017,7 @@
+@@ -2306,6 +2306,7 @@
  
    thd->sent_row_count++;
    thd->sent_row_count_2++;
@@ -89,7 +89,7 @@
        if (schema_table_store_record(thd, table))
        {
          mysql_mutex_unlock(&LOCK_thread_count);
-@@ -8082,6 +8108,12 @@
+@@ -8117,6 +8143,12 @@
     SKIP_OPEN_TABLE},
    {"TIME_MS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
     0, 0, "Time_ms", SKIP_OPEN_TABLE},

=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch	2011-06-16 01:19:11 +0000
+++ query_cache_enhance.patch	2011-08-01 03:32:34 +0000
@@ -27,7 +27,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2011-04-09 18:48:50.000000000 +0400
 +++ b/sql/mysqld.cc	2011-04-09 18:48:53.000000000 +0400
-@@ -899,6 +899,7 @@
+@@ -904,6 +904,7 @@
  #endif
  #ifdef HAVE_QUERY_CACHE
  ulong query_cache_min_res_unit= QUERY_CACHE_MIN_RESULT_DATA_SIZE;

=== modified file 'response_time_distribution.patch'
--- response_time_distribution.patch	2011-06-21 02:36:36 +0000
+++ response_time_distribution.patch	2011-08-01 03:32:34 +0000
@@ -109,7 +109,7 @@
  #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
  #include "../storage/perfschema/pfs_server.h"
  #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
-@@ -606,7 +608,7 @@
+@@ -611,7 +613,7 @@
  MY_LOCALE *my_default_lc_messages;
  MY_LOCALE *my_default_lc_time_names;
  
@@ -118,7 +118,7 @@
  SHOW_COMP_OPTION have_geometry, have_rtree_keys;
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_profiling;
-@@ -907,6 +909,10 @@
+@@ -912,6 +914,10 @@
  my_bool opt_enable_shared_memory;
  HANDLE smem_event_connect_request= 0;
  #endif
@@ -129,7 +129,7 @@
  
  my_bool opt_use_ssl  = 0;
  char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ssl_cert= NULL,
-@@ -1478,6 +1484,9 @@
+@@ -1483,6 +1489,9 @@
    my_free(opt_bin_logname);
    bitmap_free(&temp_pool);
    free_max_user_conn();
@@ -139,7 +139,7 @@
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -3960,6 +3969,9 @@
+@@ -4010,6 +4019,9 @@
    if (!DEFAULT_ERRMSGS[0][0])
      unireg_abort(1);  
  
@@ -149,7 +149,7 @@
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
    {
-@@ -6848,6 +6860,11 @@
+@@ -6906,6 +6918,11 @@
  #else
    have_query_cache=SHOW_OPTION_NO;
  #endif
@@ -716,7 +716,7 @@
  #include "lock.h"                           // MYSQL_OPEN_IGNORE_FLUSH
  #include "debug_sync.h"
  #include "datadict.h"   // dd_frm_type()
-@@ -7830,6 +7831,14 @@
+@@ -7865,6 +7866,14 @@
  
  */
  
@@ -731,7 +731,7 @@
  ST_SCHEMA_TABLE schema_tables[]=
  {
    {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
-@@ -7883,6 +7892,13 @@
+@@ -7918,6 +7927,13 @@
     1, 9, 0, OPTIMIZE_I_S_TABLE|OPEN_TABLE_ONLY},
    {"ROUTINES", proc_fields_info, create_schema_table, 
     fill_schema_proc, make_proc_old_format, 0, -1, -1, 0, 0},
@@ -785,7 +785,7 @@
          | MASTER_SYM
            { Lex->type|= REFRESH_MASTER; }
          | DES_KEY_FILE
-@@ -12597,6 +12613,7 @@
+@@ -12613,6 +12629,7 @@
          | PROXY_SYM                {}
          | QUARTER_SYM              {}
          | QUERY_SYM                {}

=== modified file 'series'
--- series	2011-07-21 09:14:03 +0000
+++ series	2011-08-01 03:32:34 +0000
@@ -29,6 +29,8 @@
 innodb_buffer_pool_pages_i_s.patch
 innodb_buffer_pool_shm.patch
 innodb_show_status_extend.patch
+innodb_kill_idle_transaction.patch
+innodb_fake_changes.patch
 slow_extended.patch
 percona_support.patch
 query_cache_enhance.patch

=== modified file 'show_slave_status_nolock.patch'
--- show_slave_status_nolock.patch	2011-06-16 01:19:11 +0000
+++ show_slave_status_nolock.patch	2011-08-01 03:32:34 +0000
@@ -29,7 +29,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2011-04-10 11:29:05.000000000 +0400
 +++ b/sql/mysqld.cc	2011-04-10 11:29:06.000000000 +0400
-@@ -3071,6 +3071,7 @@
+@@ -3121,6 +3121,7 @@
    {"show_relaylog_events", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_RELAYLOG_EVENTS]), SHOW_LONG_STATUS},
    {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
    {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
@@ -60,7 +60,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;
-@@ -2293,12 +2294,16 @@
+@@ -2354,12 +2355,16 @@
      mysql_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -78,7 +78,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2309,7 +2314,10 @@
+@@ -2370,7 +2375,10 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }

=== modified file 'show_temp.patch'
--- show_temp.patch	2011-07-06 08:42:49 +0000
+++ show_temp.patch	2011-08-01 03:32:34 +0000
@@ -27,7 +27,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2011-07-05 22:30:05.000000000 +0400
 +++ b/sql/mysqld.cc	2011-07-06 12:04:47.000000000 +0400
-@@ -3051,6 +3051,7 @@
+@@ -3101,6 +3101,7 @@
    {"show_storage_engines", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STORAGE_ENGINES]), SHOW_LONG_STATUS},
    {"show_table_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_TABLE_STATUS]), SHOW_LONG_STATUS},
    {"show_tables",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_TABLES]), SHOW_LONG_STATUS},
@@ -35,7 +35,7 @@
    {"show_triggers",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_TRIGGERS]), SHOW_LONG_STATUS},
    {"show_variables",       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_VARIABLES]), SHOW_LONG_STATUS},
    {"show_warnings",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_WARNS]), SHOW_LONG_STATUS},
-@@ -7724,6 +7725,7 @@
+@@ -7798,6 +7799,7 @@
  PSI_mutex_key key_LOCK_des_key_file;
  #endif /* HAVE_OPENSSL */
  
@@ -43,7 +43,7 @@
  PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_prep_xids,
    key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi,
    key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create,
-@@ -7777,6 +7779,7 @@
+@@ -7851,6 +7853,7 @@
    { &key_LOCK_system_variables_hash, "LOCK_system_variables_hash", PSI_FLAG_GLOBAL},
    { &key_LOCK_table_share, "LOCK_table_share", PSI_FLAG_GLOBAL},
    { &key_LOCK_thd_data, "THD::LOCK_thd_data", 0},
@@ -84,7 +84,7 @@
    case SCH_VIEWS:
    case SCH_TRIGGERS:
    case SCH_EVENTS:
-@@ -2017,6 +2022,7 @@
+@@ -2078,6 +2083,7 @@
    }
    case SQLCOM_SHOW_DATABASES:
    case SQLCOM_SHOW_TABLES:
@@ -92,7 +92,7 @@
    case SQLCOM_SHOW_TRIGGERS:
    case SQLCOM_SHOW_TABLE_STATUS:
    case SQLCOM_SHOW_OPEN_TABLES:
-@@ -4801,6 +4807,8 @@
+@@ -4841,6 +4847,8 @@
  
    case SCH_TABLE_NAMES:
    case SCH_TABLES:
@@ -104,7 +104,7 @@
 diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
 --- a/sql/sql_show.cc	2011-07-05 22:30:04.000000000 +0400
 +++ b/sql/sql_show.cc	2011-07-06 12:09:05.000000000 +0400
-@@ -2693,6 +2693,7 @@
+@@ -2692,6 +2692,7 @@
      break;
    case SQLCOM_SHOW_TABLES:
    case SQLCOM_SHOW_TABLE_STATUS:
@@ -112,7 +112,7 @@
    case SQLCOM_SHOW_TRIGGERS:
    case SQLCOM_SHOW_EVENTS:
      thd->make_lex_string(&lookup_field_values->db_value, 
-@@ -3181,6 +3182,231 @@
+@@ -3279,6 +3280,231 @@
    return (uint) OPEN_FULL_TABLE;
  }
  
@@ -344,7 +344,7 @@
  
  /**
     Try acquire high priority share metadata lock on a table (with
-@@ -6991,6 +7217,25 @@
+@@ -7023,6 +7249,25 @@
    {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
  };
  
@@ -370,7 +370,7 @@
  
  ST_FIELD_INFO columns_fields_info[]=
  {
-@@ -7605,6 +7850,9 @@
+@@ -7637,6 +7882,9 @@
     hton_fill_schema_table, 0, 0, -1, -1, 0, 0},
    {"GLOBAL_STATUS", variables_fields_info, create_schema_table,
     fill_status, make_old_format, 0, 0, -1, 0, 0},
@@ -380,7 +380,7 @@
    {"GLOBAL_VARIABLES", variables_fields_info, create_schema_table,
     fill_variables, make_old_format, 0, 0, -1, 0, 0},
    {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
-@@ -7654,6 +7902,9 @@
+@@ -7686,6 +7934,9 @@
     get_all_tables, make_table_names_old_format, 0, 1, 2, 1, 0},