Merge lp:~tsarev/percona-server/5.5.17-porting into lp:percona-server/5.5

[Oleg Tsarev]

Porting to 5.5.17
Failes in Jenkins not related to my changes (Jenkins slave failures & Sporadic failures on slaves related to limited resources of virtual machines).
http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/176/

[Stewart Smith (stewart)]

Includes patch that has not passed review and does not have any testing (modification to flush neighbors), so cannot merge as-is.

review: Needs Fixing

[Oleg Tsarev (tsarev)]

So, looks like this is Yasufumi changes.
Need reassign to him.

[Stewart Smith (stewart)]

On Thu, 03 Nov 2011 11:15:27 -0000, Oleg Tsarev <email address hidden> wrote:
> So, looks like this is Yasufumi changes.
> Need reassign to him.

yes.
--
Stewart Smith

[Stewart Smith (stewart)]

(setting to Work In Progress) as we need clean port.

=== modified file 'Makefile'
--- Makefile	2011-10-11 06:44:44 +0000
+++ Makefile	2011-11-02 10:38:52 +0000
@@ -1,6 +1,6 @@
 FETCH_CMD=wget
 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
-MYSQL_VERSION=5.5.16
+MYSQL_VERSION=5.5.17
 PERCONA_SERVER_VERSION=rel21.0
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)

=== modified file 'patches/innodb_adaptive_hash_index_partitions.patch'
--- patches/innodb_adaptive_hash_index_partitions.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_adaptive_hash_index_partitions.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -1518,7 +1518,7 @@
+@@ -1523,7 +1523,7 @@
  	}
  	ut_a(block);
  
@@ -16,7 +16,7 @@
  
  	header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;
  #ifdef UNIV_BTR_DEBUG
-@@ -1587,7 +1587,7 @@
+@@ -1592,7 +1592,7 @@
  
  #ifndef UNIV_HOTBACKUP
  	if (UNIV_LIKELY(!recovery)) {
@@ -25,7 +25,7 @@
  	}
  
  	block->check_index_page_at_flush = TRUE;
-@@ -1755,7 +1755,7 @@
+@@ -1760,7 +1760,7 @@
  	ut_a(!page_zip || page_zip_validate(page_zip, page));
  #endif /* UNIV_ZIP_DEBUG */
  
@@ -34,7 +34,7 @@
  	btr_blob_dbg_remove(page, index, "btr_page_empty");
  
  	/* Recreate the page: note that global data on page (possible
-@@ -3066,7 +3066,7 @@
+@@ -3093,7 +3093,7 @@
  		mem_heap_free(heap);
  	}
  
@@ -43,7 +43,7 @@
  
  	/* Make the father empty */
  	btr_page_empty(father_block, father_page_zip, index, page_level, mtr);
-@@ -3300,7 +3300,7 @@
+@@ -3317,7 +3317,7 @@
  			goto err_exit;
  		}
  
@@ -51,8 +51,8 @@
 +		btr_search_drop_page_hash_index(block, index);
  
  		/* Remove the page from the level list */
- 		btr_level_list_remove(space, zip_size, page, mtr);
-@@ -3345,7 +3345,7 @@
+ 		btr_level_list_remove(space, zip_size, page, index, mtr);
+@@ -3358,7 +3358,7 @@
  			goto err_exit;
  		}
  
@@ -61,7 +61,7 @@
  
  #ifdef UNIV_BTR_DEBUG
  		if (UNIV_LIKELY_NULL(merge_page_zip)) {
-@@ -3469,7 +3469,7 @@
+@@ -3473,7 +3473,7 @@
  		ut_a(btr_page_get_next(page, mtr) == FIL_NULL);
  
  		ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
@@ -70,7 +70,7 @@
  
  		btr_page_get_father(index, block, mtr, &cursor);
  		father = btr_cur_get_block(&cursor);
-@@ -3574,7 +3574,7 @@
+@@ -3578,7 +3578,7 @@
  
  	page = buf_block_get_frame(block);
  	ut_a(page_is_comp(merge_page) == page_is_comp(page));
@@ -81,7 +81,7 @@
  
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -498,7 +498,7 @@
+@@ -502,7 +502,7 @@
  #ifdef UNIV_SEARCH_PERF_STAT
  	info->n_searches++;
  #endif
@@ -90,7 +90,7 @@
  	    && latch_mode <= BTR_MODIFY_LEAF
  	    && info->last_hash_succ
  	    && !estimate
-@@ -534,7 +534,7 @@
+@@ -538,7 +538,7 @@
  
  	if (has_search_latch) {
  		/* Release possible search latch to obey latching order */
@@ -99,7 +99,7 @@
  	}
  
  	/* Store the position of the tree latch we push to mtr so that we
-@@ -856,7 +856,7 @@
+@@ -862,7 +862,7 @@
  
  	if (has_search_latch) {
  
@@ -108,7 +108,7 @@
  	}
  }
  
-@@ -1971,7 +1971,7 @@
+@@ -1992,13 +1992,13 @@
  			btr_search_update_hash_on_delete(cursor);
  		}
  
@@ -116,50 +116,14 @@
 +		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
  	}
  
- 	if (!(flags & BTR_KEEP_SYS_FLAG)) {
-@@ -1985,7 +1985,7 @@
  	row_upd_rec_in_place(rec, index, offsets, update, page_zip);
  
- 	if (block->is_hashed) {
+ 	if (is_hashed) {
 -		rw_lock_x_unlock(&btr_search_latch);
 +		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
  	}
  
  	if (page_zip && !dict_index_is_clust(index)
-@@ -2824,7 +2824,7 @@
- 	}
- 
- 	if (block->is_hashed) {
--		rw_lock_x_lock(&btr_search_latch);
-+		rw_lock_x_lock(btr_search_get_latch(index->id));
- 	}
- 
- 	page_zip = buf_block_get_page_zip(block);
-@@ -2840,7 +2840,7 @@
- 	}
- 
- 	if (block->is_hashed) {
--		rw_lock_x_unlock(&btr_search_latch);
-+		rw_lock_x_unlock(btr_search_get_latch(index->id));
- 	}
- 
- 	btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx,
-@@ -2967,13 +2967,13 @@
- 	      == dict_table_is_comp(cursor->index->table));
- 
- 	if (block->is_hashed) {
--		rw_lock_x_lock(&btr_search_latch);
-+		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
- 	}
- 
- 	btr_rec_set_deleted_flag(rec, buf_block_get_page_zip(block), val);
- 
- 	if (block->is_hashed) {
--		rw_lock_x_unlock(&btr_search_latch);
-+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
- 	}
- 
- 	btr_cur_del_mark_set_sec_rec_log(rec, val, mtr);
 --- a/storage/innobase/btr/btr0sea.c
 +++ b/storage/innobase/btr/btr0sea.c
 @@ -48,6 +48,8 @@
@@ -425,7 +389,7 @@
  	}
  
  	if (build_index) {
-@@ -881,17 +909,17 @@
+@@ -882,17 +910,17 @@
  	cursor->flag = BTR_CUR_HASH;
  
  	if (UNIV_LIKELY(!has_search_latch)) {
@@ -447,7 +411,7 @@
  
  	if (UNIV_UNLIKELY(!rec)) {
  		goto failure_unlock;
-@@ -909,7 +937,7 @@
+@@ -910,7 +938,7 @@
  			goto failure_unlock;
  		}
  
@@ -456,7 +420,7 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
  	}
-@@ -1006,7 +1034,7 @@
+@@ -1007,7 +1035,7 @@
  	/*-------------------------------------------*/
  failure_unlock:
  	if (UNIV_LIKELY(!has_search_latch)) {
@@ -465,7 +429,7 @@
  	}
  failure:
  	cursor->flag = BTR_CUR_HASH_FAIL;
-@@ -1029,10 +1057,11 @@
+@@ -1030,10 +1058,11 @@
  void
  btr_search_drop_page_hash_index(
  /*============================*/
@@ -478,7 +442,7 @@
  {
  	hash_table_t*		table;
  	ulint			n_fields;
-@@ -1051,22 +1080,60 @@
+@@ -1052,22 +1081,60 @@
  	ulint*			offsets;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -544,7 +508,7 @@
  
  #ifdef UNIV_SYNC_DEBUG
  	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)
-@@ -1076,14 +1143,14 @@
+@@ -1077,14 +1144,14 @@
  
  	n_fields = block->curr_n_fields;
  	n_bytes = block->curr_n_bytes;
@@ -561,7 +525,7 @@
  
  	ut_a(n_fields + n_bytes > 0);
  
-@@ -1133,7 +1200,7 @@
+@@ -1134,7 +1201,7 @@
  		mem_heap_free(heap);
  	}
  
@@ -570,7 +534,7 @@
  
  	if (UNIV_UNLIKELY(!block->is_hashed)) {
  		/* Someone else has meanwhile dropped the hash index */
-@@ -1149,7 +1216,7 @@
+@@ -1150,7 +1217,7 @@
  		/* Someone else has meanwhile built a new hash index on the
  		page, with different parameters */
  
@@ -579,7 +543,7 @@
  
  		mem_free(folds);
  		goto retry;
-@@ -1165,6 +1232,7 @@
+@@ -1166,6 +1233,7 @@
  
  	block->is_hashed = FALSE;
  	block->index = NULL;
@@ -587,7 +551,7 @@
  	
  cleanup:
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -1177,14 +1245,14 @@
+@@ -1178,14 +1246,14 @@
  			"InnoDB: the hash index to a page of %s,"
  			" still %lu hash nodes remain.\n",
  			index->name, (ulong) block->n_pointers);
@@ -605,7 +569,7 @@
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
  
  	mem_free(folds);
-@@ -1216,9 +1284,9 @@
+@@ -1217,9 +1285,9 @@
  	ulint*		offsets;
  	ibool		released_search_latch;
  
@@ -617,7 +581,7 @@
  
  	for (j = 0; j < srv_buf_pool_instances; j++) {
  		buf_pool_t*	buf_pool;
-@@ -1252,7 +1320,7 @@
+@@ -1253,7 +1321,7 @@
  
  
  					/* keeping latch order */
@@ -626,7 +590,7 @@
  					released_search_latch = TRUE;
  					rw_lock_x_lock(&block->lock);
  
-@@ -1304,7 +1372,7 @@
+@@ -1305,7 +1373,7 @@
  						mem_heap_empty(heap);
  					}
  
@@ -635,7 +599,7 @@
  
  					if (UNIV_UNLIKELY(!block->is_hashed)) {
  						goto cleanup;
-@@ -1314,12 +1382,12 @@
+@@ -1315,12 +1383,12 @@
  
  					if (UNIV_UNLIKELY(block->curr_n_fields != n_fields)
  					    || UNIV_UNLIKELY(block->curr_n_bytes != n_bytes)) {
@@ -650,7 +614,7 @@
  						goto retry;
  					}
  
-@@ -1333,6 +1401,7 @@
+@@ -1334,6 +1402,7 @@
  
  					block->is_hashed = FALSE;
  					block->index = NULL;
@@ -658,7 +622,7 @@
  
  cleanup:
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -1345,18 +1414,18 @@
+@@ -1346,18 +1415,18 @@
  							index->name, (ulong) block->n_pointers);
  					}
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -680,7 +644,7 @@
  
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-@@ -1403,7 +1472,7 @@
+@@ -1404,7 +1473,7 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
  
@@ -689,7 +653,7 @@
  	}
  
  	mtr_commit(&mtr);
-@@ -1445,26 +1514,26 @@
+@@ -1446,26 +1515,26 @@
  	ut_ad(index);
  	ut_a(!dict_index_is_ibuf(index));
  
@@ -722,7 +686,7 @@
  	}
  
  	n_recs = page_get_n_recs(page);
-@@ -1558,9 +1627,9 @@
+@@ -1559,9 +1628,9 @@
  		fold = next_fold;
  	}
  
@@ -734,7 +698,7 @@
  
  	if (UNIV_UNLIKELY(btr_search_fully_disabled)) {
  		goto exit_func;
-@@ -1588,6 +1657,7 @@
+@@ -1589,6 +1658,7 @@
  	block->curr_n_bytes = n_bytes;
  	block->curr_left_side = left_side;
  	block->index = index;
@@ -742,7 +706,7 @@
  
  	for (i = 0; i < n_cached; i++) {
  
-@@ -1595,7 +1665,7 @@
+@@ -1596,7 +1666,7 @@
  	}
  
  exit_func:
@@ -751,7 +715,7 @@
  
  	mem_free(folds);
  	mem_free(recs);
-@@ -1634,13 +1704,13 @@
+@@ -1635,13 +1705,13 @@
  	ut_a(!(new_block->is_hashed || block->is_hashed)
  	     || !dict_index_is_ibuf(index));
  
@@ -768,7 +732,7 @@
  
  		return;
  	}
-@@ -1655,7 +1725,7 @@
+@@ -1656,7 +1726,7 @@
  		new_block->n_bytes = block->curr_n_bytes;
  		new_block->left_side = left_side;
  
@@ -777,7 +741,7 @@
  
  		ut_a(n_fields + n_bytes > 0);
  
-@@ -1667,7 +1737,7 @@
+@@ -1668,7 +1738,7 @@
  		return;
  	}
  
@@ -786,7 +750,7 @@
  }
  
  /********************************************************************//**
-@@ -1706,7 +1776,7 @@
+@@ -1707,7 +1777,7 @@
  	ut_a(block->curr_n_fields + block->curr_n_bytes > 0);
  	ut_a(!dict_index_is_ibuf(cursor->index));
  
@@ -795,7 +759,7 @@
  
  	index_id = cursor->index->id;
  	fold = rec_fold(rec, rec_get_offsets(rec, cursor->index, offsets_,
-@@ -1715,11 +1785,11 @@
+@@ -1716,11 +1786,11 @@
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
  	}
@@ -809,7 +773,7 @@
  }
  
  /********************************************************************//**
-@@ -1753,21 +1823,21 @@
+@@ -1754,21 +1824,21 @@
  	ut_a(block->index == cursor->index);
  	ut_a(!dict_index_is_ibuf(cursor->index));
  
@@ -835,7 +799,7 @@
  
  		btr_search_update_hash_on_insert(cursor);
  	}
-@@ -1802,9 +1872,9 @@
+@@ -1803,9 +1873,9 @@
  	ulint*		offsets		= offsets_;
  	rec_offs_init(offsets_);
  
@@ -847,7 +811,7 @@
  
  	rec = btr_cur_get_rec(cursor);
  
-@@ -1849,7 +1919,7 @@
+@@ -1850,7 +1920,7 @@
  	} else {
  		if (left_side) {
  
@@ -856,7 +820,7 @@
  
  			locked = TRUE;
  
-@@ -1863,7 +1933,7 @@
+@@ -1864,7 +1934,7 @@
  
  		if (!locked) {
  
@@ -865,7 +829,7 @@
  
  			locked = TRUE;
  		}
-@@ -1881,7 +1951,7 @@
+@@ -1882,7 +1952,7 @@
  		if (!left_side) {
  
  			if (!locked) {
@@ -874,7 +838,7 @@
  
  				locked = TRUE;
  			}
-@@ -1896,7 +1966,7 @@
+@@ -1897,7 +1967,7 @@
  
  		if (!locked) {
  
@@ -883,7 +847,7 @@
  
  			locked = TRUE;
  		}
-@@ -1919,7 +1989,7 @@
+@@ -1920,7 +1990,7 @@
  		mem_heap_free(heap);
  	}
  	if (locked) {
@@ -892,7 +856,7 @@
  	}
  }
  
-@@ -1935,7 +2005,7 @@
+@@ -1936,7 +2006,7 @@
  	ha_node_t*	node;
  	ulint		n_page_dumps	= 0;
  	ibool		ok		= TRUE;
@@ -901,7 +865,7 @@
  	ulint		cell_count;
  	mem_heap_t*	heap		= NULL;
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
-@@ -1947,23 +2017,25 @@
+@@ -1948,23 +2018,25 @@
  
  	rec_offs_init(offsets_);
  
@@ -932,7 +896,7 @@
  
  		for (; node != NULL; node = node->next) {
  			const buf_block_t*	block
-@@ -2072,19 +2144,21 @@
+@@ -2073,19 +2145,21 @@
  		give other queries a chance to run. */
  		if (i != 0) {
  			buf_pool_page_hash_x_unlock_all();
@@ -1055,7 +1019,7 @@
  
 --- a/storage/innobase/dict/dict0dict.c
 +++ b/storage/innobase/dict/dict0dict.c
-@@ -1845,7 +1845,7 @@
+@@ -1846,7 +1846,7 @@
  	zero. */
  
  	for (;;) {
@@ -1078,7 +1042,7 @@
  #ifndef UNIV_HOTBACKUP
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11712,6 +11712,11 @@
+@@ -11824,6 +11824,11 @@
    "Disable with --skip-innodb-adaptive-hash-index.",
    NULL, innodb_adaptive_hash_index_update, TRUE);
  
@@ -1090,7 +1054,7 @@
  static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
    PLUGIN_VAR_RQCMDARG,
    "Replication thread delay (ms) on the slave server if "
-@@ -12091,6 +12096,7 @@
+@@ -12230,6 +12235,7 @@
    MYSQL_SYSVAR(use_sys_stats_table),
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
@@ -1283,7 +1247,7 @@
 +
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1601,7 +1601,7 @@
+@@ -1576,7 +1576,7 @@
  					pointers in the adaptive hash index
  					pointing to this frame */
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -1292,7 +1256,7 @@
  					already been built on this
  					page; note that it does not
  					guarantee that the index is
-@@ -1615,6 +1615,7 @@
+@@ -1590,6 +1590,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. */
@@ -1300,17 +1264,6 @@
  	/* @} */
  # ifdef UNIV_SYNC_DEBUG
  	/** @name Debug fields */
---- a/storage/innobase/include/row0upd.ic
-+++ b/storage/innobase/include/row0upd.ic
-@@ -158,7 +158,7 @@
- 	ut_ad(dict_index_is_clust(index));
- 	ut_ad(rec_offs_validate(rec, index, offsets));
- #ifdef UNIV_SYNC_DEBUG
--	if (!rw_lock_own(&btr_search_latch, RW_LOCK_EX)) {
-+	if (!rw_lock_own(btr_search_get_latch(index->id), RW_LOCK_EX)) {
- 		ut_ad(!buf_block_align(rec)->is_hashed);
- 	}
- #endif /* UNIV_SYNC_DEBUG */
 --- a/storage/innobase/page/page0page.c
 +++ b/storage/innobase/page/page0page.c
 @@ -218,7 +218,7 @@
@@ -1344,7 +1297,7 @@
  	ut_ad(block == back_block1);
 --- a/storage/innobase/row/row0mysql.c
 +++ b/storage/innobase/row/row0mysql.c
-@@ -2593,7 +2593,7 @@
+@@ -2594,7 +2594,7 @@
  			/* check adaptive hash entries */
  			index = dict_table_get_first_index(table);
  			while (index) {
@@ -1353,7 +1306,7 @@
  				if (ref_count) {
  					fprintf(stderr, "InnoDB: Warning:"
  						" hash index ref_count (%lu) is not zero"
-@@ -2954,7 +2954,7 @@
+@@ -2955,7 +2955,7 @@
  			table->space = space;
  			index = dict_table_get_first_index(table);
  			do {
@@ -1364,7 +1317,7 @@
  					fprintf(stderr, "InnoDB: Warning:"
 --- a/storage/innobase/row/row0sel.c
 +++ b/storage/innobase/row/row0sel.c
-@@ -1211,7 +1211,7 @@
+@@ -1222,7 +1222,7 @@
  	ut_ad(plan->unique_search);
  	ut_ad(!plan->must_get_clust);
  #ifdef UNIV_SYNC_DEBUG
@@ -1373,7 +1326,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  
  	row_sel_open_pcur(plan, TRUE, mtr);
-@@ -1382,10 +1382,10 @@
+@@ -1393,10 +1393,10 @@
  	    && !plan->must_get_clust
  	    && !plan->table->big_rows) {
  		if (!search_latch_locked) {
@@ -1386,7 +1339,7 @@
  
  			/* There is an x-latch request waiting: release the
  			s-latch for a moment; as an s-latch here is often
-@@ -1394,8 +1394,8 @@
+@@ -1405,8 +1405,8 @@
  			from acquiring an s-latch for a long time, lowering
  			performance significantly in multiprocessors. */
  
@@ -1397,7 +1350,7 @@
  		}
  
  		found_flag = row_sel_try_search_shortcut(node, plan, &mtr);
-@@ -1418,7 +1418,7 @@
+@@ -1429,7 +1429,7 @@
  	}
  
  	if (search_latch_locked) {
@@ -1406,7 +1359,7 @@
  
  		search_latch_locked = FALSE;
  	}
-@@ -1994,7 +1994,7 @@
+@@ -2005,7 +2005,7 @@
  
  func_exit:
  	if (search_latch_locked) {
@@ -1415,7 +1368,7 @@
  	}
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-@@ -3397,6 +3397,8 @@
+@@ -3408,6 +3408,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 */
@@ -1424,7 +1377,7 @@
  #ifdef UNIV_SEARCH_DEBUG
  	ulint		cnt				= 0;
  #endif /* UNIV_SEARCH_DEBUG */
-@@ -3487,18 +3489,33 @@
+@@ -3505,18 +3507,33 @@
  	/* PHASE 0: Release a possible s-latch we are holding on the
  	adaptive hash index latch if there is someone waiting behind */
  
@@ -1462,7 +1415,7 @@
  	}
  
  	/* Reset the new record lock info if srv_locks_unsafe_for_binlog
-@@ -3649,9 +3666,28 @@
+@@ -3667,9 +3684,28 @@
  			hash index semaphore! */
  
  #ifndef UNIV_SEARCH_DEBUG
@@ -1494,7 +1447,7 @@
  			}
  #endif
  			switch (row_sel_try_search_shortcut_for_mysql(
-@@ -3712,7 +3748,11 @@
+@@ -3730,7 +3766,11 @@
  
  					trx->search_latch_timeout--;
  
@@ -1507,7 +1460,7 @@
  					trx->has_search_latch = FALSE;
  				}
  
-@@ -3736,7 +3776,12 @@
+@@ -3754,7 +3794,12 @@
  	/* PHASE 3: Open or restore index cursor position */
  
  	if (trx->has_search_latch) {
@@ -1569,7 +1522,7 @@
  			(ulong) (buf_pool_from_array(0)->page_hash->n_cells * sizeof(hash_cell_t)),
 --- a/storage/innobase/sync/sync0sync.c
 +++ b/storage/innobase/sync/sync0sync.c
-@@ -1228,7 +1228,6 @@
+@@ -1222,7 +1222,6 @@
  	case SYNC_OUTER_ANY_LATCH:
  	case SYNC_FILE_FORMAT_TAG:
  	case SYNC_DOUBLEWRITE:
@@ -1577,7 +1530,7 @@
  	case SYNC_SEARCH_SYS_CONF:
  	case SYNC_TRX_LOCK_HEAP:
  	case SYNC_KERNEL:
-@@ -1249,6 +1248,7 @@
+@@ -1244,6 +1243,7 @@
  			ut_error;
  		}
  		break;

=== modified file 'patches/innodb_admin_command_base.patch'
--- patches/innodb_admin_command_base.patch	2011-10-07 21:14:32 +0000
+++ patches/innodb_admin_command_base.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11877,7 +11877,8 @@
+@@ -12016,7 +12016,8 @@
  i_s_innodb_sys_foreign_cols,
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,

=== modified file 'patches/innodb_buffer_pool_pages_i_s.patch'
--- patches/innodb_buffer_pool_pages_i_s.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_buffer_pool_pages_i_s.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4161,6 +4161,36 @@
+@@ -4224,6 +4224,36 @@
  	mutex_exit(block_mutex);
  }
  
@@ -46,7 +46,7 @@
  @return	TRUE */
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12174,6 +12174,9 @@
+@@ -12313,6 +12313,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -781,7 +781,7 @@
  #endif /* i_s_h */
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1199,6 +1199,14 @@
+@@ -1174,6 +1174,14 @@
  /*===========*/
  	const buf_pool_t*	buf_pool)	/*!< in: buffer pool */
  	__attribute__((nonnull, const));

=== modified file 'patches/innodb_buffer_pool_shm.patch'
--- patches/innodb_buffer_pool_shm.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_buffer_pool_shm.patch	2011-11-02 10:38:52 +0000
@@ -42,7 +42,7 @@
  
  
  static char*	internal_innobase_data_file_path	= NULL;
-@@ -2679,6 +2681,12 @@
+@@ -2706,6 +2708,12 @@
  	srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
  	srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
  
@@ -55,7 +55,7 @@
  	srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
  
  	srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11743,6 +11751,16 @@
+@@ -11855,6 +11863,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);
  
@@ -72,7 +72,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -12049,6 +12067,8 @@
+@@ -12187,6 +12205,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),

=== modified file 'patches/innodb_deadlock_count.patch'
--- patches/innodb_deadlock_count.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_deadlock_count.patch	2011-11-02 10:38:52 +0000
@@ -28,7 +28,7 @@
  Gets the size of a lock struct.
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -763,6 +763,7 @@
+@@ -767,6 +767,7 @@
  	ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
  	ulint innodb_dblwr_pages_written;	/*!< srv_dblwr_pages_written */
  	ulint innodb_dblwr_writes;		/*!< srv_dblwr_writes */

=== modified file 'patches/innodb_dict_size_limit.patch'
--- patches/innodb_dict_size_limit.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_dict_size_limit.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0sea.c
 +++ b/storage/innobase/btr/btr0sea.c
-@@ -1185,6 +1185,179 @@
+@@ -1186,6 +1186,179 @@
  	mem_free(folds);
  }
  
@@ -355,7 +355,7 @@
  /****************************************************************//**
  If the given column name is reserved for InnoDB system columns, return
  TRUE.
-@@ -1762,6 +1824,11 @@
+@@ -1763,6 +1825,11 @@
  	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -378,7 +378,7 @@
    {"have_atomic_builtins",
    (char*) &export_vars.innodb_have_atomic_builtins,	  SHOW_BOOL},
    {"log_waits",
-@@ -11653,6 +11655,11 @@
+@@ -11791,6 +11793,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -390,7 +390,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11721,6 +11728,7 @@
+@@ -11860,6 +11867,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),
@@ -426,7 +426,7 @@
  Drops possible hash index if the page happens to be in the buffer pool. */
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1610,6 +1610,15 @@
+@@ -1585,6 +1585,15 @@
  #define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
  /* @} */
  
@@ -444,7 +444,7 @@
  	ulint	n_page_gets;	/*!< number of page gets performed;
 --- a/storage/innobase/include/dict0dict.h
 +++ b/storage/innobase/include/dict0dict.h
-@@ -1183,6 +1183,12 @@
+@@ -1200,6 +1200,12 @@
  /*====================================*/
  	dict_table_t*	table,	/*!< in: table */
  	const char*	name);	/*!< in: name of the index to find */
@@ -459,7 +459,7 @@
  extern FILE*	dict_foreign_err_file;
 --- a/storage/innobase/include/dict0dict.ic
 +++ b/storage/innobase/include/dict0dict.ic
-@@ -824,6 +824,13 @@
+@@ -825,6 +825,13 @@
  	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold,
  		    dict_table_t*, table, ut_ad(table->cached),
  		    !strcmp(table->name, table_name));
@@ -473,7 +473,7 @@
  	return(table);
  }
  
-@@ -905,6 +912,12 @@
+@@ -918,6 +925,12 @@
  		table = dict_load_table_on_id(table_id);
  	}
  
@@ -488,7 +488,7 @@
  	/* TODO: should get the type information from MySQL */
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -230,6 +230,7 @@
+@@ -234,6 +234,7 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_flushing_method;
  
@@ -496,7 +496,7 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-@@ -710,6 +711,7 @@
+@@ -714,6 +715,7 @@
  	ulint innodb_data_writes;		/*!< I/O write requests */
  	ulint innodb_data_written;		/*!< Data bytes written */
  	ulint innodb_data_reads;		/*!< I/O read requests */

=== modified file 'patches/innodb_expand_fast_index_creation.patch'
--- patches/innodb_expand_fast_index_creation.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_expand_fast_index_creation.patch	2011-11-02 10:38:52 +0000
@@ -864,7 +864,7 @@
 +--source include/wait_until_count_sessions.inc
 --- a/sql/sql_lex.cc
 +++ b/sql/sql_lex.cc
-@@ -1631,6 +1631,9 @@
+@@ -1632,6 +1632,9 @@
    alter_list(rhs.alter_list, mem_root),
    key_list(rhs.key_list, mem_root),
    create_list(rhs.create_list, mem_root),
@@ -874,7 +874,7 @@
    flags(rhs.flags),
    keys_onoff(rhs.keys_onoff),
    tablespace_op(rhs.tablespace_op),
-@@ -1653,6 +1656,7 @@
+@@ -1654,6 +1657,7 @@
    list_copy_and_replace_each_value(alter_list, mem_root);
    list_copy_and_replace_each_value(key_list, mem_root);
    list_copy_and_replace_each_value(create_list, mem_root);
@@ -1300,7 +1300,7 @@
  
  /* Ignore posix_fadvise() on those platforms where it does not exist */
  #if defined __WIN__
-@@ -2672,6 +2673,9 @@
+@@ -2673,6 +2674,9 @@
  		}
  	}
  

=== modified file 'patches/innodb_expand_import.patch'
--- patches/innodb_expand_import.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_expand_import.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -837,7 +837,7 @@
+@@ -838,7 +838,7 @@
  /**************************************************************//**
  Creates a new index page (not the root, and also not
  used in page reorganization).  @see btr_page_empty(). */
@@ -16,7 +16,7 @@
  void
  btr_page_create(
  /*============*/
-@@ -1707,7 +1707,7 @@
+@@ -1712,7 +1712,7 @@
  #ifndef UNIV_HOTBACKUP
  /*************************************************************//**
  Empties an index page.  @see btr_page_create(). */
@@ -25,7 +25,7 @@
  void
  btr_page_empty(
  /*===========*/
-@@ -2269,7 +2269,7 @@
+@@ -2274,7 +2274,7 @@
  /**************************************************************//**
  Attaches the halves of an index page on the appropriate level in an
  index tree. */
@@ -865,7 +865,7 @@
  #endif /* !UNIV_HOTBACKUP */
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -7371,6 +7371,14 @@
+@@ -7423,6 +7423,14 @@
  		err = row_discard_tablespace_for_mysql(dict_table->name, trx);
  	} else {
  		err = row_import_tablespace_for_mysql(dict_table->name, trx);
@@ -880,7 +880,7 @@
  	}
  
  	err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
-@@ -11660,6 +11668,11 @@
+@@ -11798,6 +11806,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -892,7 +892,7 @@
  static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
    PLUGIN_VAR_RQCMDARG,
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
-@@ -11733,6 +11746,7 @@
+@@ -11872,6 +11885,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),
@@ -902,10 +902,10 @@
    MYSQL_SYSVAR(use_native_aio),
 --- a/storage/innobase/include/btr0btr.h
 +++ b/storage/innobase/include/btr0btr.h
-@@ -219,6 +219,17 @@
+@@ -238,6 +238,17 @@
  @return the uncompressed page frame */
- # define btr_page_get(space,zip_size,page_no,mode,mtr) \
- 	buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,mtr))
+ # define btr_page_get(space,zip_size,page_no,mode,idx,mtr)		\
+ 	buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,idx,mtr))
 +/**************************************************************//**
 +Sets the index id field of a page. */
 +UNIV_INLINE
@@ -920,7 +920,7 @@
  #endif /* !UNIV_HOTBACKUP */
  /**************************************************************//**
  Gets the index id field of a page.
-@@ -256,6 +267,17 @@
+@@ -275,6 +286,17 @@
  	const page_t*	page,	/*!< in: index page */
  	mtr_t*		mtr);	/*!< in: mini-transaction handle */
  /********************************************************//**
@@ -938,7 +938,7 @@
  Gets the previous index page number.
  @return	prev page number */
  UNIV_INLINE
-@@ -264,6 +286,17 @@
+@@ -283,6 +305,17 @@
  /*==============*/
  	const page_t*	page,	/*!< in: index page */
  	mtr_t*		mtr);	/*!< in: mini-transaction handle */
@@ -956,7 +956,7 @@
  /*************************************************************//**
  Gets pointer to the previous user record in the tree. It is assumed
  that the caller has appropriate latches on the page and its neighbor.
-@@ -309,6 +342,18 @@
+@@ -328,6 +361,18 @@
  /*===========================*/
  	const rec_t*	rec,	/*!< in: node pointer record */
  	const ulint*	offsets);/*!< in: array returned by rec_get_offsets() */
@@ -975,7 +975,7 @@
  /************************************************************//**
  Creates the root node for a new index tree.
  @return	page number of the created root, FIL_NULL if did not succeed */
-@@ -379,6 +424,17 @@
+@@ -397,6 +442,17 @@
  	dict_index_t*	index,	/*!< in: record descriptor */
  	mtr_t*		mtr);	/*!< in: mtr */
  /*************************************************************//**
@@ -993,7 +993,7 @@
  Decides if the page should be split at the convergence point of
  inserts converging to left.
  @return	TRUE if split recommended */
-@@ -437,6 +493,20 @@
+@@ -455,6 +511,20 @@
  # define btr_insert_on_non_leaf_level(i,l,t,m)				\
  	btr_insert_on_non_leaf_level_func(i,l,t,__FILE__,__LINE__,m)
  #endif /* !UNIV_HOTBACKUP */
@@ -1006,7 +1006,7 @@
 +/*==================*/
 +	dict_index_t*	index,		/*!< in: the index tree */
 +	buf_block_t*	block,		/*!< in/out: page to be split */
-+	const rec_t*	split_rec,	/*!< in: first record on upper
++	rec_t*		split_rec,	/*!< in: first record on upper
 +					half page */
 +	buf_block_t*	new_block,	/*!< in/out: the new half page */
 +	ulint		direction,	/*!< in: FSP_UP or FSP_DOWN */
@@ -1016,7 +1016,7 @@
  UNIV_INTERN
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -230,6 +230,8 @@
+@@ -234,6 +234,8 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_flushing_method;
  
@@ -1027,7 +1027,7 @@
  
 --- a/storage/innobase/row/row0mysql.c
 +++ b/storage/innobase/row/row0mysql.c
-@@ -2546,6 +2546,11 @@
+@@ -2547,6 +2547,11 @@
  
  	current_lsn = log_get_lsn();
  
@@ -1039,7 +1039,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
-@@ -2657,6 +2662,11 @@
+@@ -2658,6 +2663,11 @@
  
  	trx->op_info = "";
  

=== modified file 'patches/innodb_extend_slow.patch'
--- patches/innodb_extend_slow.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_extend_slow.patch	2011-11-02 10:38:52 +0000
@@ -395,7 +395,7 @@
  
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -1580,6 +1580,16 @@
+@@ -1584,6 +1584,16 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
  
@@ -412,7 +412,7 @@
  	DBUG_VOID_RETURN;
  }
  
-@@ -1634,6 +1644,32 @@
+@@ -1638,6 +1648,32 @@
  	return(trx);
  }
  
@@ -445,7 +445,7 @@
  /*********************************************************************//**
  Note that a transaction has been registered with MySQL.
  @return true if transaction is registered with MySQL 2PC coordinator */
-@@ -9302,6 +9338,25 @@
+@@ -9409,6 +9445,25 @@
  	statement has ended */
  
  	if (trx->n_mysql_tables_in_use == 0) {

=== modified file 'patches/innodb_extra_rseg.patch'
--- patches/innodb_extra_rseg.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_extra_rseg.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11542,6 +11542,7 @@
+@@ -11681,6 +11681,7 @@
    NULL, /* reserved */
    0,    /* flags */
  },

=== modified file 'patches/innodb_fake_changes.patch'
--- patches/innodb_fake_changes.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_fake_changes.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -1167,6 +1167,11 @@
+@@ -1173,6 +1173,11 @@
  	rec_t*		rec;
  	roll_ptr_t	roll_ptr;
  
@@ -19,7 +19,7 @@
  	/* Check if we have to wait for a lock: enqueue an explicit lock
  	request if yes */
  
-@@ -1298,7 +1303,7 @@
+@@ -1304,7 +1309,7 @@
  	}
  #endif /* UNIV_DEBUG */
  
@@ -28,7 +28,7 @@
  	max_size = page_get_max_insert_size_after_reorganize(page, 1);
  	leaf = page_is_leaf(page);
  
-@@ -1393,6 +1398,12 @@
+@@ -1399,6 +1404,12 @@
  		goto fail_err;
  	}
  
@@ -41,7 +41,7 @@
  	page_cursor = btr_cur_get_page_cur(cursor);
  
  	/* Now, try the insert */
-@@ -1535,10 +1546,10 @@
+@@ -1541,10 +1552,10 @@
  
  	*big_rec = NULL;
  
@@ -54,7 +54,7 @@
  				MTR_MEMO_PAGE_X_FIX));
  
  	/* Try first an optimistic insert; reset the cursor flag: we do not
-@@ -1604,6 +1615,16 @@
+@@ -1610,6 +1621,16 @@
  		}
  	}
  
@@ -71,7 +71,7 @@
  	if (dict_index_get_page(index)
  	    == buf_block_get_page_no(btr_cur_get_block(cursor))) {
  
-@@ -1660,6 +1681,11 @@
+@@ -1666,6 +1687,11 @@
  
  	ut_ad(cursor && update && thr && roll_ptr);
  
@@ -83,7 +83,7 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  
-@@ -1958,6 +1984,14 @@
+@@ -1965,6 +1991,14 @@
  		return(err);
  	}
  
@@ -95,10 +95,10 @@
 +		return(err); /* == DB_SUCCESS */
 +	}
 +
- 	if (block->is_hashed) {
- 		/* The function row_upd_changes_ord_field_binary works only
- 		if the update vector was built for a clustered index, we must
-@@ -2060,7 +2094,7 @@
+ 	if (!(flags & BTR_KEEP_SYS_FLAG)) {
+ 		row_upd_rec_sys_fields(rec, NULL,
+ 				       index, offsets, trx, roll_ptr);
+@@ -2074,7 +2108,7 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  	ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table));
@@ -107,7 +107,7 @@
  	/* The insert buffer tree should never be updated in place. */
  	ut_ad(!dict_index_is_ibuf(index));
  
-@@ -2174,6 +2208,11 @@
+@@ -2187,6 +2221,11 @@
  		goto err_exit;
  	}
  
@@ -119,7 +119,7 @@
  	/* Ok, we may do the replacement. Store on the page infimum the
  	explicit locks on rec, before deleting rec (see the comment in
  	btr_cur_pessimistic_update). */
-@@ -2324,9 +2363,9 @@
+@@ -2337,9 +2376,9 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  
@@ -131,7 +131,7 @@
  #ifdef UNIV_ZIP_DEBUG
  	ut_a(!page_zip || page_zip_validate(page_zip, page));
  #endif /* UNIV_ZIP_DEBUG */
-@@ -2414,6 +2453,9 @@
+@@ -2427,6 +2466,9 @@
  
  		ut_ad(big_rec_vec == NULL);
  
@@ -141,8 +141,8 @@
  		btr_rec_free_updated_extern_fields(
  			index, rec, page_zip, offsets, update,
  			trx_is_recv(trx) ? RB_RECOVERY : RB_NORMAL, mtr);
-@@ -2452,6 +2494,12 @@
- 		ut_ad(flags & BTR_KEEP_POS_FLAG);
+@@ -2461,6 +2503,12 @@
+ 		}
  	}
  
 +	if (trx->fake_changes) {
@@ -154,7 +154,7 @@
  	/* Store state of explicit locks on rec on the page infimum record,
  	before deleting rec. The page infimum acts as a dummy carrier of the
  	locks, taking care also of lock releases, before we can move the locks
-@@ -2807,6 +2855,11 @@
+@@ -2763,6 +2811,11 @@
  	ut_ad(dict_index_is_clust(index));
  	ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
  
@@ -166,7 +166,7 @@
  	err = lock_clust_rec_modify_check_and_lock(flags, block,
  						   rec, index, offsets, thr);
  
-@@ -2944,6 +2997,11 @@
+@@ -2897,6 +2950,11 @@
  	rec_t*		rec;
  	ulint		err;
  
@@ -193,7 +193,7 @@
  
  static handler *innobase_create_handler(handlerton *hton,
                                          TABLE_SHARE *table,
-@@ -1685,6 +1691,8 @@
+@@ -1689,6 +1695,8 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
  
@@ -202,7 +202,7 @@
  #ifdef EXTENDED_SLOWLOG
  	if (thd_log_slow_verbosity(thd) & SLOG_V_INNODB) {
  		trx->take_stats = TRUE;
-@@ -3169,6 +3177,11 @@
+@@ -3196,6 +3204,11 @@
  		trx_search_latch_release_if_reserved(trx);
  	}
  
@@ -214,7 +214,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
-@@ -7493,6 +7506,12 @@
+@@ -7545,6 +7558,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -227,7 +227,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. */
-@@ -7713,6 +7732,10 @@
+@@ -7765,6 +7784,10 @@
  		DBUG_RETURN(HA_ERR_CRASHED);
  	}
  
@@ -238,7 +238,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7769,6 +7792,12 @@
+@@ -7821,6 +7844,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -251,7 +251,7 @@
  	name_len = strlen(name);
  
  	ut_a(name_len < 1000);
-@@ -7855,6 +7884,12 @@
+@@ -7907,6 +7936,12 @@
  	trx->mysql_thd = NULL;
  #else
  	trx = innobase_trx_allocate(thd);
@@ -264,7 +264,7 @@
  #endif
  	row_drop_database_for_mysql(namebuf, trx);
  	my_free(namebuf);
-@@ -7960,6 +7995,11 @@
+@@ -8012,6 +8047,11 @@
  	trx_search_latch_release_if_reserved(parent_trx);
  
  	trx = innobase_trx_allocate(thd);
@@ -276,7 +276,7 @@
  
  	error = innobase_rename_table(trx, from, to, TRUE);
  
-@@ -10765,6 +10805,10 @@
+@@ -10872,6 +10912,10 @@
  		return(0);
  	}
  
@@ -287,7 +287,7 @@
  	thd_get_xid(thd, (MYSQL_XID*) &trx->xid);
  
  	/* Release a possible FIFO ticket and search latch. Since we will
-@@ -12307,6 +12351,7 @@
+@@ -12446,6 +12490,7 @@
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
    MYSQL_SYSVAR(lazy_drop_table),
@@ -453,7 +453,7 @@
  	}
 --- a/storage/innobase/row/row0ins.c
 +++ b/storage/innobase/row/row0ins.c
-@@ -1499,6 +1499,11 @@
+@@ -1502,6 +1502,11 @@
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
  	}
@@ -465,7 +465,7 @@
  	return(err);
  }
  
-@@ -2005,7 +2010,7 @@
+@@ -2007,7 +2012,7 @@
  	}
  
  	btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
@@ -474,7 +474,7 @@
  				    &cursor, 0, __FILE__, __LINE__, &mtr);
  
  	if (cursor.flag == BTR_CUR_INSERT_TO_IBUF) {
-@@ -2066,7 +2071,7 @@
+@@ -2067,7 +2072,7 @@
  
  			btr_cur_search_to_nth_level(index, 0, entry,
  						    PAGE_CUR_LE,
@@ -483,10 +483,11 @@
  						    &cursor, 0,
  						    __FILE__, __LINE__, &mtr);
  		}
-@@ -2154,6 +2159,21 @@
- 	mtr_commit(&mtr);
- 
+@@ -2121,6 +2126,22 @@
  	if (UNIV_LIKELY_NULL(big_rec)) {
+ 		rec_t*	rec;
+ 		ulint*	offsets;
++
 +		if (thr_get_trx(thr)->fake_changes) {
 +			/* skip store extern */
 +			if (modify) {
@@ -507,7 +508,7 @@
  		btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
 --- a/storage/innobase/row/row0mysql.c
 +++ b/storage/innobase/row/row0mysql.c
-@@ -1245,6 +1245,7 @@
+@@ -1246,6 +1246,7 @@
  		prebuilt->table->stat_n_rows--;
  	}
  
@@ -515,7 +516,7 @@
  	row_update_statistics_if_needed(prebuilt->table);
  	trx->op_info = "";
  
-@@ -1504,6 +1505,7 @@
+@@ -1505,6 +1506,7 @@
  	that changes indexed columns, UPDATEs that change only non-indexed
  	columns would not affect statistics. */
  	if (node->is_delete || !(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) {
@@ -523,7 +524,7 @@
  		row_update_statistics_if_needed(prebuilt->table);
  	}
  
-@@ -1721,6 +1723,7 @@
+@@ -1722,6 +1724,7 @@
  		srv_n_rows_updated++;
  	}
  
@@ -574,17 +575,17 @@
  
  	ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur),
  				    dict_table_is_comp(index->table)));
-@@ -2020,7 +2024,8 @@
- 	err = btr_cur_pessimistic_update(
- 		BTR_NO_LOCKING_FLAG | BTR_KEEP_POS_FLAG, btr_cur,
- 		&heap, &big_rec, node->update, node->cmpl_info, thr, mtr);
--	if (big_rec) {
+@@ -2022,7 +2026,8 @@
+ 					 node->cmpl_info, thr, mtr);
+ 	mtr_commit(mtr);
+ 
+-	if (err == DB_SUCCESS && big_rec) {
 +	/* skip store extern for fake_changes */
-+	if (big_rec && !(thr_get_trx(thr)->fake_changes)) {
++	if (err == DB_SUCCESS && big_rec && !(thr_get_trx(thr)->fake_changes)) {
  		ulint		offsets_[REC_OFFS_NORMAL_SIZE];
  		rec_t*		rec;
  		rec_offs_init(offsets_);
-@@ -2161,7 +2166,8 @@
+@@ -2146,7 +2151,8 @@
  
  	ut_a(pcur->rel_pos == BTR_PCUR_ON);
  

=== modified file 'patches/innodb_fast_checksum.patch'
--- patches/innodb_fast_checksum.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_fast_checksum.patch	2011-11-02 10:38:52 +0000
@@ -153,7 +153,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;
-@@ -2629,6 +2630,7 @@
+@@ -2656,6 +2657,7 @@
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
@@ -161,7 +161,7 @@
  
  	srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore;
  
-@@ -11426,6 +11428,15 @@
+@@ -11533,6 +11535,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -177,7 +177,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11952,6 +11963,7 @@
+@@ -12090,6 +12101,7 @@
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
    MYSQL_SYSVAR(checksums),
@@ -187,7 +187,7 @@
    MYSQL_SYSVAR(data_file_path),
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -659,6 +659,11 @@
+@@ -634,6 +634,11 @@
  buf_calc_page_new_checksum(
  /*=======================*/
  	const byte*	page);	/*!< in: buffer page */
@@ -211,7 +211,7 @@
  #define FIL_PAGE_END_LSN_OLD_CHKSUM 8	/*!< the low 4 bytes of this are used
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -225,6 +225,7 @@
+@@ -229,6 +229,7 @@
  
  extern ibool	srv_use_doublewrite_buf;
  extern ibool	srv_use_checksums;

=== modified file 'patches/innodb_files_extend.patch'
--- patches/innodb_files_extend.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_files_extend.patch	2011-11-02 10:38:52 +0000
@@ -109,7 +109,7 @@
  static my_bool innobase_thread_concurrency_timer_based;
  static long long innobase_buffer_pool_size, innobase_log_file_size;
  
-@@ -2325,6 +2328,65 @@
+@@ -2352,6 +2355,65 @@
  	}
  #endif /* DBUG_OFF */
  
@@ -175,7 +175,7 @@
  #ifndef MYSQL_SERVER
  	innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7239,9 +7301,9 @@
+@@ -7291,9 +7353,9 @@
  				| DICT_TF_COMPACT
  				| DICT_TF_FORMAT_ZIP
  				<< DICT_TF_FORMAT_SHIFT;
@@ -188,7 +188,7 @@
  		}
  	}
  
-@@ -11437,6 +11499,16 @@
+@@ -11544,6 +11606,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -205,7 +205,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11958,6 +12030,8 @@
+@@ -12096,6 +12168,8 @@
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {
@@ -216,7 +216,7 @@
    MYSQL_SYSVAR(buffer_pool_size),
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1740,7 +1740,7 @@
+@@ -1715,7 +1715,7 @@
  	time_t		last_printout_time;
  					/*!< when buf_print_io was last time
  					called */
@@ -225,7 +225,7 @@
  					/*!< Statistics of buddy system,
  					indexed by block size */
  	buf_pool_stat_t	stat;		/*!< current statistics */
-@@ -1838,7 +1838,7 @@
+@@ -1813,7 +1813,7 @@
  	UT_LIST_BASE_NODE_T(buf_page_t)	zip_clean;
  					/*!< unmodified compressed pages */
  #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
@@ -234,7 +234,7 @@
  					/*!< buddy free lists */
  
  	buf_page_t			watch[BUF_POOL_WATCH_SIZE];
-@@ -1846,9 +1846,9 @@
+@@ -1821,9 +1821,9 @@
  					pool watches. Protected by
  				       	buf_pool->mutex. */
  
@@ -358,7 +358,7 @@
  #define TRX_SYS_MYSQL_MASTER_LOG_INFO	(UNIV_PAGE_SIZE - 2000)
 --- a/storage/innobase/include/univ.i
 +++ b/storage/innobase/include/univ.i
-@@ -310,9 +310,13 @@
+@@ -313,9 +313,13 @@
  */
  
  /* The 2-logarithm of UNIV_PAGE_SIZE: */
@@ -374,7 +374,7 @@
  
  /* Maximum number of parallel threads in a parallelized operation */
  #define UNIV_MAX_PARALLELISM	32
-@@ -431,7 +435,7 @@
+@@ -434,7 +438,7 @@
  stored part of the field in the tablespace. The length field then
  contains the sum of the following flag and the locally stored len. */
  
@@ -383,7 +383,7 @@
  
  /* Some macros to improve branch prediction and reduce cache misses */
  #if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER)
-@@ -534,4 +538,6 @@
+@@ -537,4 +541,6 @@
  	UNIV_MEM_ALLOC(addr, size);			\
  } while (0)
  
@@ -412,7 +412,7 @@
  	dest_offset = nth_file * group->file_size;
  
  #ifdef UNIV_DEBUG
-@@ -1794,9 +1799,7 @@
+@@ -1796,9 +1801,7 @@
  	ulint		i;
  
  	ut_ad(mutex_own(&(log_sys->mutex)));
@@ -423,7 +423,7 @@
  
  	buf = group->checkpoint_buf;
  
-@@ -1810,6 +1813,7 @@
+@@ -1812,6 +1815,7 @@
  	mach_write_to_4(buf + LOG_CHECKPOINT_LOG_BUF_SIZE, log_sys->buf_size);
  
  #ifdef UNIV_LOG_ARCHIVE
@@ -431,7 +431,7 @@
  	if (log_sys->archiving_state == LOG_ARCH_OFF) {
  		archived_lsn = IB_ULONGLONG_MAX;
  	} else {
-@@ -1823,7 +1827,9 @@
+@@ -1825,7 +1829,9 @@
  
  	mach_write_to_8(buf + LOG_CHECKPOINT_ARCHIVED_LSN, archived_lsn);
  #else /* UNIV_LOG_ARCHIVE */

=== modified file 'patches/innodb_fix_misc.patch'
--- patches/innodb_fix_misc.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_fix_misc.patch	2011-11-02 10:38:52 +0000
@@ -68,7 +68,7 @@
  			block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
  			ut_a(block_mutex);
  		}
-@@ -3471,11 +3513,28 @@
+@@ -3472,11 +3514,28 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -97,7 +97,7 @@
  	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
  		/* The page is already in the buffer pool. */
  		watch_page = NULL;
-@@ -3606,6 +3665,7 @@
+@@ -3607,6 +3666,7 @@
  		bpage->state	= BUF_BLOCK_ZIP_PAGE;
  		bpage->space	= space;
  		bpage->offset	= offset;
@@ -105,7 +105,7 @@
  
  #ifdef UNIV_DEBUG
  		bpage->in_page_hash = FALSE;
-@@ -3690,6 +3750,7 @@
+@@ -3691,6 +3751,7 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -113,7 +113,7 @@
  	//buf_pool_mutex_enter(buf_pool);
  	mutex_enter(&buf_pool->LRU_list_mutex);
  	rw_lock_x_lock(&buf_pool->page_hash_latch);
-@@ -3697,6 +3758,21 @@
+@@ -3698,6 +3759,21 @@
  	block = (buf_block_t*) buf_page_hash_get_low(
  		buf_pool, space, offset, fold);
  
@@ -135,7 +135,7 @@
  	if (block
  	    && buf_page_in_file(&block->page)
  	    && !buf_pool_watch_is_sentinel(buf_pool, &block->page)) {
-@@ -3988,8 +4064,11 @@
+@@ -4051,8 +4127,11 @@
  	}
  
  	if (io_type == BUF_IO_WRITE
@@ -452,7 +452,7 @@
  	ut_a(ret);
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12029,6 +12029,12 @@
+@@ -12167,6 +12167,12 @@
    "except for the deletion.",
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
@@ -465,7 +465,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(page_size),
    MYSQL_SYSVAR(log_block_size),
-@@ -12122,6 +12128,7 @@
+@@ -12261,6 +12267,7 @@
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
@@ -473,7 +473,7 @@
    NULL
  };
  
-@@ -12131,7 +12138,7 @@
+@@ -12270,7 +12277,7 @@
    &innobase_storage_engine,
    innobase_hton_name,
    plugin_author,
@@ -484,7 +484,7 @@
    NULL, /* Plugin Deinit */
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1493,6 +1493,7 @@
+@@ -1468,6 +1468,7 @@
  					0 if the block was never accessed
  					in the buffer pool */
  	/* @} */
@@ -612,7 +612,7 @@
  
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -245,6 +245,8 @@
+@@ -249,6 +249,8 @@
  extern ulint	srv_pass_corrupt_table;
  
  extern ulint	srv_dict_size_limit;
@@ -623,17 +623,17 @@
  extern ulint	srv_n_rows_inserted;
 --- a/storage/innobase/include/sync0sync.h
 +++ b/storage/innobase/include/sync0sync.h
-@@ -693,6 +693,7 @@
+@@ -690,6 +690,7 @@
  #define	SYNC_BUF_POOL		150	/* Buffer pool mutex */
  #define	SYNC_BUF_FLUSH_LIST	145	/* Buffer flush list mutex */
  #define SYNC_DOUBLEWRITE	140
 +#define	SYNC_OUTER_ANY_LATCH	136
  #define	SYNC_ANY_LATCH		135
- #define SYNC_THR_LOCAL		133
  #define	SYNC_MEM_HASH		131
+ #define	SYNC_MEM_POOL		130
 --- a/storage/innobase/include/univ.i
 +++ b/storage/innobase/include/univ.i
-@@ -52,6 +52,11 @@
+@@ -53,6 +53,11 @@
  #define INNODB_VERSION_MINOR	1
  #define INNODB_VERSION_BUGFIX	8
  
@@ -645,7 +645,7 @@
  /* The following is the InnoDB version as shown in
  SELECT plugin_version FROM information_schema.plugins;
  calculated in make_version_string() in sql/sql_show.cc like this:
-@@ -64,7 +69,8 @@
+@@ -65,7 +70,8 @@
  #define INNODB_VERSION_STR			\
  	IB_TO_STR(INNODB_VERSION_MAJOR) "."	\
  	IB_TO_STR(INNODB_VERSION_MINOR) "."	\
@@ -764,7 +764,7 @@
  
  /** Provide optional 4.x backwards compatibility for 5.0 and above */
  UNIV_INTERN ibool	row_rollback_on_timeout	= FALSE;
-@@ -1191,6 +1192,13 @@
+@@ -1192,6 +1193,13 @@
  
  	thr = que_fork_get_first_thr(prebuilt->ins_graph);
  
@@ -778,7 +778,7 @@
  	if (prebuilt->sql_stat_start) {
  		node->state = INS_NODE_SET_IX_LOCK;
  		prebuilt->sql_stat_start = FALSE;
-@@ -2575,10 +2583,29 @@
+@@ -2576,10 +2584,29 @@
  
  			err = DB_ERROR;
  		} else {
@@ -808,7 +808,7 @@
  		}
  	}
  
-@@ -2927,6 +2954,19 @@
+@@ -2928,6 +2955,19 @@
  			table->space = space;
  			index = dict_table_get_first_index(table);
  			do {
@@ -830,7 +830,7 @@
  			} while (index);
 --- a/storage/innobase/row/row0sel.c
 +++ b/storage/innobase/row/row0sel.c
-@@ -3407,6 +3407,7 @@
+@@ -3418,6 +3418,7 @@
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
  	ulint*		offsets				= offsets_;
  	ibool		table_lock_waited		= FALSE;
@@ -838,7 +838,7 @@
  
  	rec_offs_init(offsets_);
  
-@@ -3778,6 +3779,17 @@
+@@ -3796,6 +3797,17 @@
  
  	/* Do some start-of-statement preparations */
  
@@ -856,7 +856,7 @@
  	if (!prebuilt->sql_stat_start) {
  		/* No need to set an intention lock or assign a read view */
  
-@@ -3788,6 +3800,18 @@
+@@ -3806,6 +3818,18 @@
  			      " perform a consistent read\n"
  			      "InnoDB: but the read view is not assigned!\n",
  			      stderr);
@@ -899,9 +899,9 @@
  	}
 --- a/storage/innobase/sync/sync0sync.c
 +++ b/storage/innobase/sync/sync0sync.c
-@@ -1225,6 +1225,7 @@
+@@ -1219,6 +1219,7 @@
+ 	case SYNC_LOG:
  	case SYNC_LOG_FLUSH_ORDER:
- 	case SYNC_THR_LOCAL:
  	case SYNC_ANY_LATCH:
 +	case SYNC_OUTER_ANY_LATCH:
  	case SYNC_FILE_FORMAT_TAG:

=== modified file 'patches/innodb_io_patches.patch'
--- patches/innodb_io_patches.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_io_patches.patch	2011-11-02 10:38:52 +0000
@@ -34,7 +34,11 @@
  
  	/* We know that the writes have been flushed to disk now
  	and in recovery we will find them in the doublewrite buffer
-@@ -1378,7 +1378,7 @@
+@@ -1375,10 +1375,11 @@
+ 	ulint		high;
+ 	ulint		count = 0;
+ 	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
++	ibool		is_forward_scan;
  
  	ut_ad(flush_type == BUF_FLUSH_LRU || flush_type == BUF_FLUSH_LIST);
  
@@ -43,6 +47,104 @@
  		/* If there is little space, it is better not to flush
  		any block except from the end of the LRU list */
  
+@@ -1405,7 +1406,30 @@
+ 		high = fil_space_get_size(space);
+ 	}
+ 
+-	for (i = low; i < high; i++) {
++	if (srv_flush_neighbor_pages == 2) {
++		if (offset > low) {
++			is_forward_scan = FALSE; /* start form backward */
++		} else {
++			is_forward_scan = TRUE;
++		}
++	} else {
++		is_forward_scan = TRUE;
++	}
++
++scan:
++	if (srv_flush_neighbor_pages == 2) {
++		if (is_forward_scan) {
++			i = offset;
++		} else {
++			ut_a(offset > low);
++			i = offset - 1;
++		}
++	} else {
++		i = low;
++	}
++
++	for (;is_forward_scan ? (i < high) : (i >= low);
++	      is_forward_scan ? (i++) : (i--)) {
+ 
+ 		buf_page_t*	bpage;
+ 
+@@ -1417,7 +1441,7 @@
+ 			are flushing has not been flushed yet then
+ 			we'll try to flush the victim that we
+ 			selected originally. */
+-			if (i <= offset) {
++			if (is_forward_scan && i <= offset) {
+ 				i = offset;
+ 			} else {
+ 				break;
+@@ -1434,6 +1458,10 @@
+ 		if (!bpage) {
+ 
+ 			buf_pool_mutex_exit(buf_pool);
++			/* not contiguous */
++			if (srv_flush_neighbor_pages == 2) {
++				break;
++			}
+ 			continue;
+ 		}
+ 
+@@ -1464,12 +1492,25 @@
+ 				ut_ad(!mutex_own(block_mutex));
+ 				ut_ad(!buf_pool_mutex_own(buf_pool));
+ 				count++;
++				/* contiguous */
+ 				continue;
+ 			} else {
+ 				mutex_exit(block_mutex);
+ 			}
+ 		}
+ 		buf_pool_mutex_exit(buf_pool);
++
++		/* not contiguous */
++		if (srv_flush_neighbor_pages == 2) {
++			break;
++		}
++	}
++
++	if (!is_forward_scan) {
++		/* backward scan was done. */
++		ut_a(srv_flush_neighbor_pages == 2);
++		is_forward_scan = TRUE;
++		goto scan;
+ 	}
+ 
+ 	return(count);
+@@ -1940,6 +1981,19 @@
+ 
+ 		buf_pool = buf_pool_from_array(i);
+ 
++		if (lsn_limit != IB_ULONGLONG_MAX) {
++			buf_page_t*	bpage;
++
++			buf_flush_list_mutex_enter(buf_pool);
++			bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
++			if (!bpage || bpage->oldest_modification >= lsn_limit) {
++				buf_flush_list_mutex_exit(buf_pool);
++				continue;
++			} else {
++				buf_flush_list_mutex_exit(buf_pool);
++			}
++		}
++
+ 		if (!buf_flush_start(buf_pool, BUF_FLUSH_LIST)) {
+ 			/* We have two choices here. If lsn_limit was
+ 			specified then skipping an instance of buffer
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
 @@ -427,6 +427,10 @@
@@ -165,7 +267,7 @@
  /********************************************************************//**
  Obtain the InnoDB transaction of a MySQL thread.
  @return	reference to transaction pointer */
-@@ -2444,6 +2461,9 @@
+@@ -2471,6 +2488,9 @@
  	srv_n_read_io_threads = (ulint) innobase_read_io_threads;
  	srv_n_write_io_threads = (ulint) innobase_write_io_threads;
  
@@ -175,7 +277,7 @@
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
-@@ -11026,7 +11046,7 @@
+@@ -11133,7 +11153,7 @@
    PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
    "Purge threads can be either 0 or 1.",
    NULL, NULL,
@@ -184,7 +286,7 @@
    0,			/* Minimum value */
    1, 0);		/* Maximum value */
  
-@@ -11068,12 +11088,18 @@
+@@ -11175,12 +11195,18 @@
    innodb_file_format_max_validate,
    innodb_file_format_max_update, "Antelope");
  
@@ -209,7 +311,7 @@
  
  static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11173,7 +11199,7 @@
+@@ -11285,7 +11311,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.",
@@ -218,7 +320,7 @@
  
  static MYSQL_SYSVAR_LONG(buffer_pool_instances, innobase_buffer_pool_instances,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11330,6 +11356,95 @@
+@@ -11442,6 +11468,121 @@
    "trigger a readahead.",
    NULL, NULL, 56, 0, 64, 0);
  
@@ -242,10 +344,36 @@
 +  "Control soft limit of checkpoint age. (0 : not control)",
 +  NULL, NULL, 0, 0, ~0UL, 0);
 +
-+static MYSQL_SYSVAR_ULONG(flush_neighbor_pages, srv_flush_neighbor_pages,
++static
++void
++innodb_flush_neighbor_pages_update(
++  THD* thd,
++  struct st_mysql_sys_var* var,
++  void* var_ptr,
++  const void* save)
++{
++  *(long *)var_ptr= (*(long *)save) % 3;
++}
++const char *flush_neighbor_pages_names[]=
++{
++  "none", /* 0 */
++  "area",
++  "contiguous", /* 2 */
++  /* For compatibility of the older patch */
++  "0", /* 3 ("none" + 3) */
++  "1",
++  "2", /* 5 ("contiguous" + 3) */
++  NullS
++};
++TYPELIB flush_neighbor_pages_typelib=
++{
++  array_elements(flush_neighbor_pages_names) - 1, "flush_neighbor_pages_typelib",
++  flush_neighbor_pages_names, NULL
++};
++static MYSQL_SYSVAR_ENUM(flush_neighbor_pages, srv_flush_neighbor_pages,
 +  PLUGIN_VAR_RQCMDARG,
-+  "Enable/Disable flushing also neighbor pages. 0:disable 1:enable",
-+  NULL, NULL, 1, 0, 1, 0);
++  "Control flushing also neighbor pages (none, [area], contiguous).",
++  NULL, innodb_flush_neighbor_pages_update, 1, &flush_neighbor_pages_typelib);
 +
 +static
 +void
@@ -314,7 +442,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11350,6 +11465,7 @@
+@@ -11462,6 +11603,7 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
@@ -322,7 +450,7 @@
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
    MYSQL_SYSVAR(large_prefix),
-@@ -11388,6 +11504,13 @@
+@@ -11501,6 +11643,13 @@
    MYSQL_SYSVAR(show_verbose_locks),
    MYSQL_SYSVAR(show_locks_held),
    MYSQL_SYSVAR(version),
@@ -474,8 +602,8 @@
 +extern char	srv_use_global_flush_log_at_trx_commit;
  extern char	srv_adaptive_flushing;
  
- 
-@@ -217,6 +218,16 @@
+ /* If this flag is TRUE, then we will load the indexes' (and tables') metadata
+@@ -221,6 +222,16 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -492,7 +620,7 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-@@ -395,8 +406,9 @@
+@@ -399,8 +410,9 @@
  				when writing data files, but do flush
  				after writing to log files */
  	SRV_UNIX_NOSYNC,	/*!< do not flush after writing */
@@ -612,20 +740,43 @@
  		log_sys->flushed_to_disk_lsn = log_sys->write_lsn;
  	}
  
-@@ -2120,10 +2151,10 @@
+@@ -1654,11 +1685,13 @@
+ 
+ 		recv_apply_hashed_log_recs(TRUE);
+ 	}
+-
++retry:
+ 	n_pages = buf_flush_list(ULINT_MAX, new_oldest);
+ 
+-	if (sync) {
+-		buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
++	if (sync && n_pages != 0) {
++		//buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
++		os_thread_sleep(100000);
++		goto retry;
+ 	}
+ 
+ 	if (n_pages == ULINT_UNDEFINED) {
+@@ -2119,13 +2152,15 @@
+ 		/* A flush is urgent: we have to do a synchronous preflush */
  
  		sync = TRUE;
- 		advance = 2 * (age - log->max_modified_age_sync);
+-		advance = 2 * (age - log->max_modified_age_sync);
 -	} else if (age > log->max_modified_age_async) {
++		advance = (age - log->max_modified_age_sync); /* no need *2. sync=TRUE is enough as brake */
 +	} else if (age > log_max_modified_age_async()) {
  
  		/* A flush is not urgent: we do an asynchronous preflush */
 -		advance = age - log->max_modified_age_async;
 +		advance = age - log_max_modified_age_async();
++		log->check_flush_or_checkpoint = FALSE;
  	} else {
  		advance = 0;
++		log->check_flush_or_checkpoint = FALSE;
  	}
-@@ -2137,7 +2168,7 @@
+ 
+ 	checkpoint_age = log->lsn - log->last_checkpoint_lsn;
+@@ -2137,21 +2172,21 @@
  
  		do_checkpoint = TRUE;
  
@@ -634,7 +785,33 @@
  		/* A checkpoint is not urgent: do it asynchronously */
  
  		do_checkpoint = TRUE;
-@@ -2607,7 +2638,7 @@
+ 
+-		log->check_flush_or_checkpoint = FALSE;
++		//log->check_flush_or_checkpoint = FALSE;
+ 	} else {
+-		log->check_flush_or_checkpoint = FALSE;
++		//log->check_flush_or_checkpoint = FALSE;
+ 	}
+ 
+ 	mutex_exit(&(log->mutex));
+ 
+ 	if (advance) {
+ 		ib_uint64_t	new_oldest = oldest_lsn + advance;
+-
++retry:
+ 		success = log_preflush_pool_modified_pages(new_oldest, sync);
+ 
+ 		/* If the flush succeeded, this thread has done its part
+@@ -2166,7 +2201,7 @@
+ 			log->check_flush_or_checkpoint = TRUE;
+ 
+ 			mutex_exit(&(log->mutex));
+-			goto loop;
++			goto retry;
+ 		}
+ 	}
+ 
+@@ -2607,7 +2642,7 @@
  
  	mutex_exit(&(log_sys->mutex));
  
@@ -643,7 +820,7 @@
  
  	mutex_enter(&(log_sys->mutex));
  
-@@ -3349,6 +3380,17 @@
+@@ -3349,6 +3384,17 @@
  		log_sys->flushed_to_disk_lsn,
  		log_sys->last_checkpoint_lsn);
  
@@ -862,7 +1039,7 @@
 +#define PCT_IBUF_IO(pct) ((ulint) (srv_io_capacity * srv_ibuf_accel_rate * ((double) pct / 10000.0)))
 +
 +UNIV_INTERN ulint	srv_checkpoint_age_target = 0;
-+UNIV_INTERN ulint	srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */
++UNIV_INTERN ulint	srv_flush_neighbor_pages = 1; /* 0:disable 1:enable 2:contiguous */
 +
 +UNIV_INTERN ulint	srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */
 +UNIV_INTERN ulint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */

=== modified file 'patches/innodb_kill_idle_transaction.patch'
--- patches/innodb_kill_idle_transaction.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_kill_idle_transaction.patch	2011-11-02 10:38:52 +0000
@@ -87,7 +87,7 @@
    Implementation of Drop_table_error_handler::handle_condition().
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -2833,6 +2833,10 @@
+@@ -2860,6 +2860,10 @@
  
  	innobase_commit_concurrency_init_default();
  
@@ -98,7 +98,7 @@
  #ifdef HAVE_PSI_INTERFACE
  	/* Register keys with MySQL performance schema */
  	if (PSI_server) {
-@@ -11579,6 +11583,48 @@
+@@ -11686,6 +11690,48 @@
  	return(false);
  }
  
@@ -147,7 +147,7 @@
  static SHOW_VAR innodb_status_variables_export[]= {
    {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
    {NullS, NullS, SHOW_LONG}
-@@ -11865,6 +11911,15 @@
+@@ -11977,6 +12023,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);
  
@@ -163,7 +163,7 @@
  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.",
-@@ -12167,6 +12222,7 @@
+@@ -12305,6 +12360,7 @@
    MYSQL_SYSVAR(fast_checksum),
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
@@ -173,7 +173,7 @@
    MYSQL_SYSVAR(data_home_dir),
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -292,6 +292,7 @@
+@@ -296,6 +296,7 @@
  extern ulint	srv_activity_count;
  extern ulint	srv_fatal_semaphore_wait_threshold;
  extern ulint	srv_dml_needed_delay;

=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-10-03 01:19:24 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0lru.c
 +++ b/storage/innobase/buf/buf0lru.c
-@@ -2167,6 +2167,289 @@
+@@ -2183,6 +2183,289 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
  
@@ -392,7 +392,7 @@
  /** Possible values for system variable "innodb_stats_method". The values
  are defined the same as its corresponding MyISAM system variable
  "myisam_stats_method"(see "myisam_stats_method_names"), for better usability */
-@@ -2625,6 +2627,8 @@
+@@ -2652,6 +2654,8 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
@@ -401,7 +401,7 @@
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
  		os_large_page_size = (ulint) opt_large_page_size;
-@@ -11804,6 +11808,19 @@
+@@ -11942,6 +11946,19 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -421,7 +421,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11887,6 +11904,8 @@
+@@ -12026,6 +12043,8 @@
    MYSQL_SYSVAR(random_read_ahead),
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
@@ -496,8 +496,8 @@
 +buf_LRU_file_restore(void);
 +/*======================*/
  
- #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
- /**********************************************************************//**
+ /******************************************************************//**
+ Remove one page from LRU list and put it to free list */
 --- a/storage/innobase/include/buf0rea.h
 +++ b/storage/innobase/include/buf0rea.h
 @@ -31,6 +31,37 @@
@@ -557,7 +557,7 @@
  handler for completed requests. The aio array of pending requests is divided
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -357,6 +357,12 @@
+@@ -361,6 +361,12 @@
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
  
@@ -570,7 +570,7 @@
  /** Status variables to be passed to MySQL */
  typedef struct export_var_struct export_struc;
  
-@@ -662,6 +668,16 @@
+@@ -666,6 +672,16 @@
  /*=====================*/
  	void*	arg);	/*!< in: a dummy parameter required by
  			os_thread_create */

=== modified file 'patches/innodb_opt_lru_count.patch'
--- patches/innodb_opt_lru_count.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_opt_lru_count.patch	2011-11-02 10:38:52 +0000
@@ -38,7 +38,7 @@
  	ut_d(bpage->in_page_hash = FALSE);
  
  	/* relocate buf_pool->LRU */
-@@ -3283,8 +3283,8 @@
+@@ -3284,8 +3284,8 @@
  		bpage->in_zip_hash = FALSE;
  		bpage->in_flush_list = FALSE;
  		bpage->in_free_list = FALSE;
@@ -48,7 +48,7 @@
  
  		ut_d(bpage->in_page_hash = TRUE);
  
-@@ -3449,7 +3449,7 @@
+@@ -3450,7 +3450,7 @@
  	ibuf_merge_or_delete_for_page(NULL, space, offset, zip_size, TRUE);
  
  	/* Flush pages from the end of the LRU list if necessary */
@@ -94,7 +94,7 @@
  
  	return(FALSE);
  }
-@@ -1985,8 +1988,14 @@
+@@ -2039,8 +2042,14 @@
  	buf_page_t*	bpage;
  	ulint		n_replaceable;
  	ulint		distance	= 0;
@@ -110,7 +110,7 @@
  
  	n_replaceable = UT_LIST_GET_LEN(buf_pool->free);
  
-@@ -1997,7 +2006,13 @@
+@@ -2051,7 +2060,13 @@
  		   + BUF_FLUSH_EXTRA_MARGIN(buf_pool))
  	       && (distance < BUF_LRU_FREE_SEARCH_LEN(buf_pool))) {
  
@@ -125,7 +125,7 @@
  
  		mutex_enter(block_mutex);
  
-@@ -2012,11 +2027,18 @@
+@@ -2066,11 +2081,18 @@
  		bpage = UT_LIST_GET_PREV(LRU, bpage);
  	}
  
@@ -145,7 +145,7 @@
  	}
  
  	return(BUF_FLUSH_FREE_BLOCK_MARGIN(buf_pool)
-@@ -2034,7 +2056,8 @@
+@@ -2088,7 +2110,8 @@
  void
  buf_flush_free_margin(
  /*==================*/
@@ -155,7 +155,7 @@
  {
  	ulint	n_to_flush;
  
-@@ -2045,7 +2068,7 @@
+@@ -2099,7 +2122,7 @@
  
  		n_flushed = buf_flush_LRU(buf_pool, n_to_flush);
  
@@ -164,7 +164,7 @@
  			/* There was an LRU type flush batch already running;
  			let us wait for it to end */
  
-@@ -2058,8 +2081,9 @@
+@@ -2112,8 +2135,9 @@
  Flushes pages from the end of all the LRU lists. */
  UNIV_INTERN
  void
@@ -175,7 +175,7 @@
  {
  	ulint	i;
  
-@@ -2068,7 +2092,7 @@
+@@ -2122,7 +2146,7 @@
  
  		buf_pool = buf_pool_from_array(i);
  
@@ -271,7 +271,7 @@
  	if (buf_debug_prints) {
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1442,11 +1442,11 @@
+@@ -1417,11 +1417,11 @@
  
  	UT_LIST_NODE_T(buf_page_t) LRU;
  					/*!< node of the LRU list */

=== modified file 'patches/innodb_overwrite_relay_log_info.patch'
--- patches/innodb_overwrite_relay_log_info.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_overwrite_relay_log_info.patch	2011-11-02 10:38:52 +0000
@@ -55,7 +55,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;
-@@ -2255,6 +2275,89 @@
+@@ -2282,6 +2302,89 @@
  	}
  #endif /* DBUG_OFF */
  
@@ -145,7 +145,7 @@
  	/* Check that values don't overflow on 32-bit systems. */
  	if (sizeof(ulint) == 4) {
  		if (innobase_buffer_pool_size > UINT_MAX32) {
-@@ -2553,6 +2656,76 @@
+@@ -2580,6 +2683,76 @@
  		goto mem_free_and_error;
  	}
  
@@ -222,7 +222,7 @@
  	innobase_old_blocks_pct = buf_LRU_old_ratio_update(
  		innobase_old_blocks_pct, TRUE);
  
-@@ -2667,6 +2840,25 @@
+@@ -2694,6 +2867,25 @@
  	trx_t*	trx)	/*!< in: transaction handle */
  {
  	if (trx_is_started(trx)) {
@@ -248,7 +248,7 @@
  
  		trx_commit_for_mysql(trx);
  	}
-@@ -11015,6 +11207,12 @@
+@@ -11122,6 +11314,12 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -261,7 +261,7 @@
  static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "Enable InnoDB doublewrite buffer (enabled by default). "
-@@ -11486,6 +11684,7 @@
+@@ -11625,6 +11823,7 @@
    MYSQL_SYSVAR(old_blocks_pct),
    MYSQL_SYSVAR(old_blocks_time),
    MYSQL_SYSVAR(open_files),

=== modified file 'patches/innodb_pass_corrupt_table.patch'
--- patches/innodb_pass_corrupt_table.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_pass_corrupt_table.patch	2011-11-02 10:38:52 +0000
@@ -7,10 +7,10 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -691,6 +691,12 @@
- 	root_page_no = dict_index_get_page(index);
+@@ -692,6 +692,12 @@
  
- 	block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr);
+ 	block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH,
+ 			      index, mtr);
 +
 +	if (srv_pass_corrupt_table && !block) {
 +		return(0);
@@ -20,7 +20,7 @@
  	ut_a((ibool)!!page_is_comp(buf_block_get_frame(block))
  	     == dict_table_is_comp(index->table));
  #ifdef UNIV_BTR_DEBUG
-@@ -977,6 +983,12 @@
+@@ -978,6 +984,12 @@
  
  	root = btr_root_get(index, &mtr);
  
@@ -33,24 +33,24 @@
  	if (flag == BTR_N_LEAF_PAGES) {
  		seg_header = root + PAGE_HEADER + PAGE_BTR_SEG_LEAF;
  
-@@ -1433,6 +1445,13 @@
- 	mtr_start(&mtr);
+@@ -1437,6 +1449,13 @@
  
- 	root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, &mtr);
+ 	root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH,
+ 			    NULL, &mtr);
 +
 +	if (srv_pass_corrupt_table && !root) {
 +		mtr_commit(&mtr);
 +		return;
 +	}
 +	ut_a(root);
-+	
++
  #ifdef UNIV_BTR_DEBUG
  	ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
  				    + root, space));
-@@ -1455,6 +1474,12 @@
- 	mtr_start(&mtr);
+@@ -1460,6 +1479,12 @@
  
- 	root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, &mtr);
+ 	root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH,
+ 			    NULL, &mtr);
 +
 +	if (srv_pass_corrupt_table && !root) {
 +		mtr_commit(&mtr);
@@ -60,9 +60,9 @@
  #ifdef UNIV_BTR_DEBUG
  	ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_TOP
  				    + root, space));
-@@ -1488,6 +1513,11 @@
- 
- 	block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr);
+@@ -1493,6 +1518,11 @@
+ 	block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH,
+ 			      NULL, mtr);
  
 +	if (srv_pass_corrupt_table && !block) {
 +		return;
@@ -74,57 +74,57 @@
  	header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -250,6 +250,11 @@
- 	case BTR_MODIFY_LEAF:
+@@ -251,6 +251,11 @@
  		mode = latch_mode == BTR_SEARCH_LEAF ? RW_S_LATCH : RW_X_LATCH;
- 		get_block = btr_block_get(space, zip_size, page_no, mode, mtr);
-+
-+		if (srv_pass_corrupt_table && !get_block) {
-+			return;
-+		}
-+		ut_a(get_block);
- #ifdef UNIV_BTR_DEBUG
- 		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
- #endif /* UNIV_BTR_DEBUG */
-@@ -263,6 +268,11 @@
- 			get_block = btr_block_get(space, zip_size,
- 						  left_page_no,
- 						  RW_X_LATCH, mtr);
-+
-+			if (srv_pass_corrupt_table && !get_block) {
-+				return;
-+			}
-+			ut_a(get_block);
- #ifdef UNIV_BTR_DEBUG
- 			ut_a(page_is_comp(get_block->frame)
- 			     == page_is_comp(page));
-@@ -274,6 +284,11 @@
- 
- 		get_block = btr_block_get(space, zip_size, page_no,
- 					  RW_X_LATCH, mtr);
-+
-+		if (srv_pass_corrupt_table && !get_block) {
-+			return;
-+		}
-+		ut_a(get_block);
- #ifdef UNIV_BTR_DEBUG
- 		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
- #endif /* UNIV_BTR_DEBUG */
-@@ -285,6 +300,11 @@
- 			get_block = btr_block_get(space, zip_size,
- 						  right_page_no,
- 						  RW_X_LATCH, mtr);
-+
-+			if (srv_pass_corrupt_table && !get_block) {
-+				return;
-+			}
-+			ut_a(get_block);
- #ifdef UNIV_BTR_DEBUG
- 			ut_a(page_is_comp(get_block->frame)
- 			     == page_is_comp(page));
-@@ -306,6 +326,11 @@
- 			get_block = btr_block_get(space, zip_size,
- 						  left_page_no, mode, mtr);
+ 		get_block = btr_block_get(
+ 			space, zip_size, page_no, mode, cursor->index, mtr);
++
++		if (srv_pass_corrupt_table && !get_block) {
++			return;
++		}
++		ut_a(get_block);
+ #ifdef UNIV_BTR_DEBUG
+ 		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
+ #endif /* UNIV_BTR_DEBUG */
+@@ -264,6 +269,11 @@
+ 			get_block = btr_block_get(
+ 				space, zip_size, left_page_no,
+ 				RW_X_LATCH, cursor->index, mtr);
++
++			if (srv_pass_corrupt_table && !get_block) {
++				return;
++			}
++			ut_a(get_block);
+ #ifdef UNIV_BTR_DEBUG
+ 			ut_a(page_is_comp(get_block->frame)
+ 			     == page_is_comp(page));
+@@ -276,6 +286,11 @@
+ 		get_block = btr_block_get(
+ 			space, zip_size, page_no,
+ 			RW_X_LATCH, cursor->index, mtr);
++
++		if (srv_pass_corrupt_table && !get_block) {
++			return;
++		}
++		ut_a(get_block);
+ #ifdef UNIV_BTR_DEBUG
+ 		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
+ #endif /* UNIV_BTR_DEBUG */
+@@ -287,6 +302,11 @@
+ 			get_block = btr_block_get(
+ 				space, zip_size, right_page_no,
+ 				RW_X_LATCH, cursor->index, mtr);
++
++			if (srv_pass_corrupt_table && !get_block) {
++				return;
++			}
++			ut_a(get_block);
+ #ifdef UNIV_BTR_DEBUG
+ 			ut_a(page_is_comp(get_block->frame)
+ 			     == page_is_comp(page));
+@@ -309,6 +329,11 @@
+ 				space, zip_size,
+ 				left_page_no, mode, cursor->index, mtr);
  			cursor->left_block = get_block;
 +
 +			if (srv_pass_corrupt_table && !get_block) {
@@ -134,10 +134,10 @@
  #ifdef UNIV_BTR_DEBUG
  			ut_a(page_is_comp(get_block->frame)
  			     == page_is_comp(page));
-@@ -316,6 +341,11 @@
- 		}
+@@ -320,6 +345,11 @@
  
- 		get_block = btr_block_get(space, zip_size, page_no, mode, mtr);
+ 		get_block = btr_block_get(
+ 			space, zip_size, page_no, mode, cursor->index, mtr);
 +
 +		if (srv_pass_corrupt_table && !get_block) {
 +			return;
@@ -146,7 +146,7 @@
  #ifdef UNIV_BTR_DEBUG
  		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
  #endif /* UNIV_BTR_DEBUG */
-@@ -588,6 +618,19 @@
+@@ -592,6 +622,19 @@
  		file, line, mtr);
  
  	if (block == NULL) {
@@ -166,7 +166,7 @@
  		/* This must be a search to perform an insert/delete
  		mark/ delete; try using the insert/delete buffer */
  
-@@ -662,6 +705,16 @@
+@@ -666,6 +709,16 @@
  	block->check_index_page_at_flush = TRUE;
  	page = buf_block_get_frame(block);
  
@@ -183,7 +183,7 @@
  	if (rw_latch != RW_NO_LATCH) {
  #ifdef UNIV_ZIP_DEBUG
  		const page_zip_des_t*	page_zip
-@@ -866,6 +919,17 @@
+@@ -872,6 +925,17 @@
  					 RW_NO_LATCH, NULL, BUF_GET,
  					 file, line, mtr);
  		page = buf_block_get_frame(block);
@@ -201,7 +201,7 @@
  		ut_ad(index->id == btr_page_get_index_id(page));
  
  		block->check_index_page_at_flush = TRUE;
-@@ -986,6 +1050,14 @@
+@@ -992,6 +1056,14 @@
  					 RW_NO_LATCH, NULL, BUF_GET,
  					 file, line, mtr);
  		page = buf_block_get_frame(block);
@@ -216,7 +216,7 @@
  		ut_ad(index->id == btr_page_get_index_id(page));
  
  		if (height == ULINT_UNDEFINED) {
-@@ -1199,6 +1271,12 @@
+@@ -1205,6 +1277,12 @@
  	*big_rec = NULL;
  
  	block = btr_cur_get_block(cursor);
@@ -229,7 +229,7 @@
  	page = buf_block_get_frame(block);
  	index = cursor->index;
  	zip_size = buf_block_get_zip_size(block);
-@@ -2988,6 +3066,11 @@
+@@ -2937,6 +3015,11 @@
  
  	block = btr_cur_get_block(cursor);
  
@@ -241,7 +241,7 @@
  	ut_ad(page_is_leaf(buf_block_get_frame(block)));
  
  	rec = btr_cur_get_rec(cursor);
-@@ -3701,6 +3784,11 @@
+@@ -3650,6 +3733,11 @@
  
  		page = btr_cur_get_page(&cursor);
  
@@ -277,9 +277,9 @@
  	index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));
  
  	page_cursor = btr_pcur_get_page_cur(cursor);
-@@ -392,6 +398,15 @@
- 	next_block = btr_block_get(space, zip_size, next_page_no,
- 				   cursor->latch_mode, mtr);
+@@ -395,6 +401,15 @@
+ 				   cursor->latch_mode,
+ 				   btr_pcur_get_btr_cur(cursor)->index, mtr);
  	next_page = buf_block_get_frame(next_block);
 +
 +	if (srv_pass_corrupt_table && !next_page) {
@@ -374,7 +374,7 @@
  #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	bpage->file_page_was_freed = FALSE;
  #endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
-@@ -3845,6 +3866,7 @@
+@@ -3899,6 +3920,7 @@
  				(ulong) bpage->offset);
  		}
  
@@ -382,7 +382,7 @@
  		/* From version 3.23.38 up we store the page checksum
  		to the 4 first bytes of the page end lsn field */
  
-@@ -3886,6 +3908,23 @@
+@@ -3940,6 +3962,23 @@
  			      REFMAN "forcing-innodb-recovery.html\n"
  			      "InnoDB: about forcing recovery.\n", stderr);
  
@@ -404,17 +404,17 @@
 +				bpage->is_corrupt = TRUE;
 +			} else
  			if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {
- 				fputs("InnoDB: Ending processing because of"
- 				      " a corrupt database page.\n",
-@@ -3893,6 +3932,7 @@
- 				exit(1);
+ 				/* If page space id is larger than TRX_SYS_SPACE
+ 				(0), we will attempt to mark the corresponding
+@@ -3956,6 +3995,7 @@
+ 				}
  			}
  		}
 +		} /**/
  
  		if (recv_recovery_is_on()) {
  			/* Pages must be uncompressed for crash recovery. */
-@@ -3902,8 +3942,11 @@
+@@ -3965,8 +4005,11 @@
  
  		if (uncompressed && !recv_no_ibuf_operations) {
  			ibuf_merge_or_delete_for_page(
@@ -445,10 +445,10 @@
  		/* The i/o is already completed when we arrive from
 --- a/storage/innobase/dict/dict0dict.c
 +++ b/storage/innobase/dict/dict0dict.c
-@@ -54,6 +54,7 @@
- #include "row0merge.h"
+@@ -55,6 +55,7 @@
  #include "m_ctype.h" /* my_isspace() */
  #include "ha_prototypes.h" /* innobase_strcasecmp(), innobase_casedn_str()*/
+ #include "row0upd.h"
 +#include "srv0start.h" /* SRV_LOG_SPACE_FIRST_ID */
  
  #include <ctype.h>
@@ -471,7 +471,7 @@
  			goto next_loop;
  
  		cached_foreign_tables = 0;
-@@ -4366,6 +4367,12 @@
+@@ -4367,6 +4368,12 @@
  	heap = mem_heap_create(1000);
  
  	while (index) {
@@ -484,7 +484,7 @@
  		size = btr_get_size(index, BTR_TOTAL_SIZE);
  
  		index->stat_index_size = size;
-@@ -4513,6 +4520,12 @@
+@@ -4514,6 +4521,12 @@
  	heap = mem_heap_create(1000);
  
  	while (index) {
@@ -497,7 +497,7 @@
  /*===========================================*/
  {
  	dict_table_t*	sys_stats;
-@@ -4705,6 +4718,13 @@
+@@ -4706,6 +4719,13 @@
  		     || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO
  			 && dict_index_is_clust(index)))) {
  			ulint	size;
@@ -511,9 +511,9 @@
  			size = btr_get_size(index, BTR_TOTAL_SIZE);
  
  			index->stat_index_size = size;
-@@ -5501,4 +5521,42 @@
- 		rw_lock_free(&dict_table_stats_latches[i]);
- 	}
+@@ -5685,4 +5705,42 @@
+ 
+ 	index->type |= DICT_CORRUPT;
  }
 +
 +/*************************************************************************
@@ -787,7 +787,7 @@
  	if (descr != NULL) {
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -3985,6 +3985,12 @@
+@@ -4012,6 +4012,12 @@
  		DBUG_RETURN(1);
  	}
  
@@ -800,7 +800,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
-@@ -4012,6 +4018,19 @@
+@@ -4039,6 +4045,19 @@
  	/* Get pointer to a table object in InnoDB dictionary cache */
  	ib_table = dict_table_get(norm_name, TRUE);
  	
@@ -820,7 +820,7 @@
  	if (NULL == ib_table) {
  		if (is_part && retries < 10) {
  			++retries;
-@@ -5161,6 +5180,10 @@
+@@ -5188,6 +5207,10 @@
  
  	ha_statistic_increment(&SSV::ha_write_count);
  
@@ -831,7 +831,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
  		table->timestamp_field->set_time();
  
-@@ -5378,6 +5401,10 @@
+@@ -5405,6 +5428,10 @@
  func_exit:
  	innobase_active_small();
  
@@ -842,7 +842,7 @@
  	DBUG_RETURN(error_result);
  }
  
-@@ -5554,6 +5581,10 @@
+@@ -5581,6 +5608,10 @@
  
  	ha_statistic_increment(&SSV::ha_update_count);
  
@@ -853,7 +853,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
  		table->timestamp_field->set_time();
  
-@@ -5643,6 +5674,10 @@
+@@ -5670,6 +5701,10 @@
  
  	innobase_active_small();
  
@@ -864,7 +864,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5664,6 +5699,10 @@
+@@ -5691,6 +5726,10 @@
  
  	ha_statistic_increment(&SSV::ha_delete_count);
  
@@ -875,7 +875,7 @@
  	if (!prebuilt->upd_node) {
  		row_get_prebuilt_update_vector(prebuilt);
  	}
-@@ -5690,6 +5729,10 @@
+@@ -5717,6 +5756,10 @@
  
  	innobase_active_small();
  
@@ -886,7 +886,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5929,6 +5972,10 @@
+@@ -5956,6 +5999,10 @@
  
  	ha_statistic_increment(&SSV::ha_read_key_count);
  
@@ -896,8 +896,8 @@
 +
  	index = prebuilt->index;
  
- 	if (UNIV_UNLIKELY(index == NULL)) {
-@@ -5994,6 +6041,10 @@
+ 	if (UNIV_UNLIKELY(index == NULL) || dict_index_is_corrupted(index)) {
+@@ -6023,6 +6070,10 @@
  		ret = DB_UNSUPPORTED;
  	}
  
@@ -908,7 +908,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -6109,6 +6160,10 @@
+@@ -6138,6 +6189,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -919,7 +919,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -6199,6 +6254,10 @@
+@@ -6251,6 +6306,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -930,7 +930,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -6208,6 +6267,10 @@
+@@ -6260,6 +6319,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -941,7 +941,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7474,10 +7537,18 @@
+@@ -7526,10 +7589,18 @@
  
  	update_thd(ha_thd());
  
@@ -960,7 +960,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -7978,6 +8049,16 @@
+@@ -8034,6 +8105,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -977,7 +977,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
-@@ -8155,7 +8236,7 @@
+@@ -8211,7 +8292,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -986,7 +986,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8455,10 +8536,18 @@
+@@ -8511,10 +8592,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -1005,7 +1005,7 @@
  	return(0);
  }
  
-@@ -8640,6 +8729,10 @@
+@@ -8747,6 +8836,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -1016,7 +1016,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9410,6 +9503,10 @@
+@@ -9517,6 +9610,10 @@
  
  	update_thd(thd);
  
@@ -1027,7 +1027,7 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11829,6 +11926,26 @@
+@@ -11967,6 +12064,26 @@
    "dump file (if present). Disabled by default.",
    NULL, NULL, FALSE);
  
@@ -1054,7 +1054,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11918,6 +12035,7 @@
+@@ -12057,6 +12174,7 @@
    MYSQL_SYSVAR(purge_threads),
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
@@ -1091,7 +1091,7 @@
  #define BTR_MAX_NODE_LEVEL	50	/*!< Maximum B-tree page level
  					(not really a hard limit).
  					Used in debug assertions
-@@ -55,7 +55,9 @@
+@@ -59,7 +59,9 @@
  	block = buf_page_get_gen(space, zip_size, page_no, mode,
  				 NULL, BUF_GET, file, line, mtr);
  
@@ -1100,11 +1100,11 @@
 +
 +	if (block && mode != RW_NO_LATCH) {
  
- 		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
- 	}
+ 		buf_block_dbg_add_level(
+ 			block, index != NULL && dict_index_is_ibuf(index)
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1041,7 +1041,7 @@
+@@ -1016,7 +1016,7 @@
  	const buf_block_t*	block)	/*!< in: pointer to the control block */
  	__attribute__((pure));
  #else /* UNIV_DEBUG */
@@ -1113,7 +1113,7 @@
  #endif /* UNIV_DEBUG */
  /*********************************************************************//**
  Gets the space id of a block.
-@@ -1488,6 +1488,7 @@
+@@ -1463,6 +1463,7 @@
  					0 if the block was never accessed
  					in the buffer pool */
  	/* @} */
@@ -1147,9 +1147,9 @@
  	switch (buf_block_get_state(block)) {
 --- a/storage/innobase/include/dict0dict.h
 +++ b/storage/innobase/include/dict0dict.h
-@@ -1258,6 +1258,15 @@
- dict_close(void);
- /*============*/
+@@ -1326,6 +1326,15 @@
+ /*========================*/
+ 	ulint		space_id);	/*!< in: space ID */
  
 +/*************************************************************************
 +set is_corrupt flag by space_id*/
@@ -1165,7 +1165,7 @@
  #endif
 --- a/storage/innobase/include/dict0mem.h
 +++ b/storage/innobase/include/dict0mem.h
-@@ -666,6 +666,7 @@
+@@ -670,6 +670,7 @@
  				the AUTOINC lock on this table. */
  				/* @} */
  	/*----------------------*/
@@ -1220,7 +1220,7 @@
  	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
 --- a/storage/innobase/include/page0page.h
 +++ b/storage/innobase/include/page0page.h
-@@ -527,7 +527,7 @@
+@@ -497,7 +497,7 @@
  page_is_leaf(
  /*=========*/
  	const page_t*	page)	/*!< in: page */
@@ -1254,7 +1254,7 @@
  Decompress a page.  This function should tolerate errors on the compressed
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -241,6 +241,7 @@
+@@ -245,6 +245,7 @@
  extern ulint	srv_adaptive_flushing_method;
  
  extern ulint	srv_expand_import;
@@ -1277,7 +1277,7 @@
  	ut_ad(page_simple_validate_new((page_t*) page));
 --- a/storage/innobase/row/row0ins.c
 +++ b/storage/innobase/row/row0ins.c
-@@ -1335,6 +1335,12 @@
+@@ -1338,6 +1338,12 @@
  		const rec_t*		rec = btr_pcur_get_rec(&pcur);
  		const buf_block_t*	block = btr_pcur_get_block(&pcur);
  
@@ -1308,7 +1308,7 @@
  
 --- a/storage/innobase/row/row0sel.c
 +++ b/storage/innobase/row/row0sel.c
-@@ -3894,6 +3894,13 @@
+@@ -3912,6 +3912,13 @@
  	/* PHASE 4: Look for matching records in a loop */
  
  	rec = btr_pcur_get_rec(pcur);
@@ -1322,7 +1322,7 @@
  	ut_ad(!!page_rec_is_comp(rec) == comp);
  #ifdef UNIV_SEARCH_DEBUG
  	/*
-@@ -3971,7 +3978,13 @@
+@@ -3989,7 +3996,13 @@
  	if (UNIV_UNLIKELY(next_offs >= UNIV_PAGE_SIZE - PAGE_DIR)) {
  
  wrong_offs:
@@ -1337,7 +1337,7 @@
  			ut_print_timestamp(stderr);
  			buf_page_print(page_align(rec), 0);
  			fprintf(stderr,
-@@ -4022,7 +4035,8 @@
+@@ -4040,7 +4053,8 @@
  
  	offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
  

=== modified file 'patches/innodb_recovery_patches.patch'
--- patches/innodb_recovery_patches.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_recovery_patches.patch	2011-11-02 10:38:52 +0000
@@ -115,7 +115,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;
-@@ -2583,6 +2584,8 @@
+@@ -2610,6 +2611,8 @@
  
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
@@ -124,7 +124,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11275,6 +11278,11 @@
+@@ -11382,6 +11385,11 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -136,7 +136,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 "
-@@ -11758,6 +11766,7 @@
+@@ -11896,6 +11904,7 @@
    MYSQL_SYSVAR(data_file_path),
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),

=== modified file 'patches/innodb_separate_doublewrite.patch'
--- patches/innodb_separate_doublewrite.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_separate_doublewrite.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -3814,7 +3814,8 @@
+@@ -3868,7 +3868,8 @@
  		read_space_id = mach_read_from_4(
  			frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
  
@@ -71,7 +71,7 @@
  
  
  /** Following are six InnoDB system tables */
-@@ -811,7 +812,7 @@
+@@ -816,7 +817,7 @@
  
  		mtr_commit(&mtr);
  
@@ -80,7 +80,7 @@
  			/* The system tablespace always exists. */
  		} else if (in_crash_recovery) {
  			/* Check that the tablespace (the .ibd file) really
-@@ -1682,7 +1683,7 @@
+@@ -1727,7 +1728,7 @@
  	space = mach_read_from_4(field);
  
  	/* Check if the tablespace exists and has the right name */
@@ -89,7 +89,7 @@
  		flags = dict_sys_tables_get_flags(rec);
  
  		if (UNIV_UNLIKELY(flags == ULINT_UNDEFINED)) {
-@@ -1835,7 +1836,7 @@
+@@ -1880,7 +1881,7 @@
  		goto err_exit;
  	}
  
@@ -341,7 +341,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
-@@ -2481,6 +2482,8 @@
+@@ -2508,6 +2509,8 @@
  		goto error;
  	}
  
@@ -350,7 +350,7 @@
  	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
  
  	/* -------------- Log files ---------------------------*/
-@@ -11651,6 +11654,11 @@
+@@ -11763,6 +11766,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -362,7 +362,7 @@
  static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The AUTOINC lock modes supported by InnoDB:               "
-@@ -11830,6 +11838,7 @@
+@@ -11968,6 +11976,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
@@ -506,7 +506,7 @@
  UNIV_INLINE
 --- a/storage/innobase/row/row0mysql.c
 +++ b/storage/innobase/row/row0mysql.c
-@@ -3425,7 +3425,7 @@
+@@ -3436,7 +3436,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
  

=== modified file 'patches/innodb_show_lock_name.patch'
--- patches/innodb_show_lock_name.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_show_lock_name.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -9594,9 +9594,8 @@
+@@ -9701,9 +9701,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
  #else /* UNIV_DEBUG */
@@ -19,7 +19,7 @@
  		buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
  				     (ulong) mutex->count_os_wait);
  
-@@ -9611,10 +9610,8 @@
+@@ -9718,10 +9717,8 @@
  
  	if (block_mutex) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -32,7 +32,7 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_mutex_oswait_count);
-@@ -9643,9 +9640,8 @@
+@@ -9750,9 +9747,8 @@
  			continue;
  		}
  
@@ -44,7 +44,7 @@
  		buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
  				      (ulong) lock->count_os_wait);
  
-@@ -9659,10 +9655,8 @@
+@@ -9766,10 +9762,8 @@
  
  	if (block_lock) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -244,7 +244,7 @@
  /******************************************************************//**
  NOTE! Please use the corresponding macro mutex_enter(), not directly
  this function!
-@@ -733,9 +733,9 @@
+@@ -729,9 +729,9 @@
  	ulint	line;		/*!< Line where the mutex was locked */
  	ulint	level;		/*!< Level in the global latching order */
  #endif /* UNIV_SYNC_DEBUG */
@@ -255,7 +255,7 @@
  	os_thread_id_t thread_id; /*!< The thread id of the thread
  				which locked the mutex. */
  	ulint		magic_n;	/*!< MUTEX_MAGIC_N */
-@@ -750,9 +750,9 @@
+@@ -746,9 +746,9 @@
  	ulong		count_os_yield;	/*!< count of os_wait */
  	ulonglong	lspent_time;	/*!< mutex os_wait timer msec */
  	ulonglong	lmax_spent_time;/*!< mutex os_wait timer msec */
@@ -268,7 +268,7 @@
  					instrumentation hook */
 --- a/storage/innobase/include/sync0sync.ic
 +++ b/storage/innobase/include/sync0sync.ic
-@@ -321,13 +321,13 @@
+@@ -320,13 +320,13 @@
  	mysql_pfs_key_t	key,		/*!< in: Performance Schema key */
  	mutex_t*	mutex,		/*!< in: pointer to memory */
  # ifdef UNIV_DEBUG
@@ -285,7 +285,7 @@
  {
  	mutex->pfs_psi = (PSI_server && PFS_IS_INSTRUMENTED(key))
  				? PSI_server->init_mutex(key, mutex)
-@@ -335,13 +335,13 @@
+@@ -334,13 +334,13 @@
  
  	mutex_create_func(mutex,
  # ifdef UNIV_DEBUG

=== modified file 'patches/innodb_show_status.patch'
--- patches/innodb_show_status.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_show_status.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4369,6 +4369,7 @@
+@@ -4426,6 +4426,7 @@
  	}
  
  	total_info->pool_size += pool_info->pool_size;
@@ -15,7 +15,7 @@
  	total_info->lru_len += pool_info->lru_len;
  	total_info->old_lru_len += pool_info->old_lru_len;
  	total_info->free_list_len += pool_info->free_list_len;
-@@ -4434,6 +4435,8 @@
+@@ -4491,6 +4492,8 @@
  
  	pool_info->pool_size = buf_pool->curr_size;
  
@@ -24,7 +24,7 @@
  	pool_info->lru_len = UT_LIST_GET_LEN(buf_pool->LRU);
  
  	pool_info->old_lru_len = buf_pool->LRU_old_len;
-@@ -4555,14 +4558,16 @@
+@@ -4612,14 +4615,16 @@
  	ut_ad(pool_info);
  
  	fprintf(file,
@@ -101,7 +101,7 @@
    {"buffer_pool_pages_free",
    (char*) &export_vars.innodb_buffer_pool_pages_free,	  SHOW_LONG},
  #ifdef UNIV_DEBUG
-@@ -11087,6 +11089,16 @@
+@@ -11199,6 +11201,16 @@
    "Force InnoDB to not use next-key locking, to use only row-level locking.",
    NULL, NULL, FALSE);
  
@@ -118,7 +118,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11274,7 +11286,7 @@
+@@ -11386,7 +11398,7 @@
  
  static MYSQL_SYSVAR_STR(version, innodb_version_str,
    PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
@@ -127,7 +127,7 @@
  
  static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11373,6 +11385,8 @@
+@@ -11486,6 +11498,8 @@
    MYSQL_SYSVAR(thread_concurrency),
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),
@@ -178,9 +178,9 @@
  Create a consistent cursor view for mysql to be used in cursors. In this
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -142,6 +142,9 @@
- extern char	srv_adaptive_flushing;
- 
+@@ -146,6 +146,9 @@
+ corrupted index and table */
+ extern my_bool	srv_load_corrupted;
  
 +extern ulint    srv_show_locks_held;
 +extern ulint    srv_show_verbose_locks;
@@ -188,7 +188,7 @@
  /* The sort order table of the MySQL latin1_swedish_ci character set
  collation */
  extern const byte*	srv_latin1_ordering;
-@@ -324,6 +327,8 @@
+@@ -328,6 +331,8 @@
  buffer pool to disk */
  extern ulint srv_buf_pool_flushed;
  
@@ -197,7 +197,7 @@
  /** Number of buffer pool reads that led to the
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
-@@ -703,6 +708,7 @@
+@@ -707,6 +712,7 @@
  	ulint innodb_buffer_pool_reads;		/*!< srv_buf_pool_reads */
  	ulint innodb_buffer_pool_wait_free;	/*!< srv_buf_pool_wait_free */
  	ulint innodb_buffer_pool_pages_flushed;	/*!< srv_buf_pool_flushed */

=== modified file 'patches/innodb_show_status_extend.patch'
--- patches/innodb_show_status_extend.patch	2011-10-10 14:35:27 +0000
+++ patches/innodb_show_status_extend.patch	2011-11-02 10:38:52 +0000
@@ -240,7 +240,7 @@
  /** The lock system */
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -735,6 +735,11 @@
+@@ -739,6 +739,11 @@
  
  /** Status variables to be passed to MySQL */
  struct export_var_struct{
@@ -252,7 +252,7 @@
  	ulint innodb_data_pending_reads;	/*!< Pending reads */
  	ulint innodb_data_pending_writes;	/*!< Pending writes */
  	ulint innodb_data_pending_fsyncs;	/*!< Pending fsyncs */
-@@ -752,6 +757,9 @@
+@@ -756,6 +761,9 @@
  #ifdef UNIV_DEBUG
  	ulint innodb_buffer_pool_pages_latched;	/*!< Latched pages */
  #endif /* UNIV_DEBUG */
@@ -262,7 +262,7 @@
  	ulint innodb_buffer_pool_read_requests;	/*!< buf_pool->stat.n_page_gets */
  	ulint innodb_buffer_pool_reads;		/*!< srv_buf_pool_reads */
  	ulint innodb_buffer_pool_wait_free;	/*!< srv_buf_pool_wait_free */
-@@ -761,13 +769,43 @@
+@@ -765,13 +773,43 @@
  	ulint innodb_buffer_pool_read_ahead_rnd;/*!< srv_read_ahead_rnd */
  	ulint innodb_buffer_pool_read_ahead;	/*!< srv_read_ahead */
  	ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
@@ -306,7 +306,7 @@
  	ulint innodb_os_log_written;		/*!< srv_os_log_written */
  	ulint innodb_os_log_fsyncs;		/*!< fil_n_log_flushes */
  	ulint innodb_os_log_pending_writes;	/*!< srv_os_log_pending_writes */
-@@ -776,6 +814,8 @@
+@@ -780,6 +818,8 @@
  	ulint innodb_pages_created;		/*!< buf_pool->stat.n_pages_created */
  	ulint innodb_pages_read;		/*!< buf_pool->stat.n_pages_read */
  	ulint innodb_pages_written;		/*!< buf_pool->stat.n_pages_written */
@@ -315,7 +315,7 @@
  	ulint innodb_row_lock_waits;		/*!< srv_n_lock_wait_count */
  	ulint innodb_row_lock_current_waits;	/*!< srv_n_lock_wait_current_count */
  	ib_int64_t innodb_row_lock_time;	/*!< srv_n_lock_wait_time
-@@ -785,11 +825,18 @@
+@@ -789,11 +829,18 @@
  						/ srv_n_lock_wait_count */
  	ulint innodb_row_lock_time_max;		/*!< srv_n_lock_max_wait_time
  						/ 1000 */
@@ -336,7 +336,7 @@
  /** Thread slot in the thread table */
 --- a/storage/innobase/include/sync0sync.h
 +++ b/storage/innobase/include/sync0sync.h
-@@ -771,6 +771,10 @@
+@@ -767,6 +767,10 @@
  
  #define	SYNC_SPIN_ROUNDS	srv_n_spin_wait_rounds
  

=== modified file 'patches/innodb_show_sys_tables.patch'
--- patches/innodb_show_sys_tables.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_show_sys_tables.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/dict/dict0load.c
 +++ b/storage/innobase/dict/dict0load.c
-@@ -437,7 +437,7 @@
+@@ -442,7 +442,7 @@
  
  }
  
@@ -16,7 +16,7 @@
  /********************************************************************//**
  This function parses a SYS_FOREIGN record and populate a dict_foreign_t
  structure with the information from the record. For detail information
-@@ -513,9 +513,9 @@
+@@ -518,9 +518,9 @@
  
  	return(NULL);
  }
@@ -28,7 +28,7 @@
  /********************************************************************//**
  This function parses a SYS_FOREIGN_COLS record and extract necessary
  information from the record and return to caller.
-@@ -579,7 +579,7 @@
+@@ -584,7 +584,7 @@
  
  	return(NULL);
  }
@@ -39,7 +39,7 @@
  Determine the flags of a table described in SYS_TABLES.
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11786,7 +11786,14 @@
+@@ -11925,7 +11925,14 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,

=== modified file 'patches/innodb_split_buf_pool_mutex.patch'
--- patches/innodb_split_buf_pool_mutex.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_split_buf_pool_mutex.patch	2011-11-02 10:38:52 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -4142,7 +4142,8 @@
+@@ -4091,7 +4091,8 @@
  
  	mtr_commit(mtr);
  
@@ -17,7 +17,7 @@
  	mutex_enter(&block->mutex);
  
  	/* Only free the block if it is still allocated to
-@@ -4153,16 +4154,21 @@
+@@ -4102,16 +4103,21 @@
  	    && buf_block_get_space(block) == space
  	    && buf_block_get_page_no(block) == page_no) {
  
@@ -45,7 +45,7 @@
  
 --- a/storage/innobase/btr/btr0sea.c
 +++ b/storage/innobase/btr/btr0sea.c
-@@ -1943,7 +1943,7 @@
+@@ -1944,7 +1944,7 @@
  	rec_offs_init(offsets_);
  
  	rw_lock_x_lock(&btr_search_latch);
@@ -54,7 +54,7 @@
  
  	cell_count = hash_get_n_cells(btr_search_sys->hash_index);
  
-@@ -1951,11 +1951,11 @@
+@@ -1952,11 +1952,11 @@
  		/* We release btr_search_latch every once in a while to
  		give other queries a chance to run. */
  		if ((i != 0) && ((i % chunk_size) == 0)) {
@@ -68,7 +68,7 @@
  		}
  
  		node = hash_get_nth_cell(btr_search_sys->hash_index, i)->node;
-@@ -2066,11 +2066,11 @@
+@@ -2067,11 +2067,11 @@
  		/* We release btr_search_latch every once in a while to
  		give other queries a chance to run. */
  		if (i != 0) {
@@ -82,7 +82,7 @@
  		}
  
  		if (!ha_validate(btr_search_sys->hash_index, i, end_index)) {
-@@ -2078,7 +2078,7 @@
+@@ -2079,7 +2079,7 @@
  		}
  	}
  
@@ -283,7 +283,7 @@
  {
  	buf_page_t*	bpage;
  	const ulint	size	= BUF_BUDDY_LOW << i;
-@@ -335,13 +362,20 @@
+@@ -334,13 +361,20 @@
  	ulint		space;
  	ulint		page_no;
  
@@ -305,7 +305,7 @@
  	/* We assume that all memory from buf_buddy_alloc()
  	is used for compressed page frames. */
  
-@@ -375,6 +409,11 @@
+@@ -374,6 +408,11 @@
  		added to buf_pool->page_hash yet.  Obviously,
  		it cannot be relocated. */
  
@@ -317,7 +317,7 @@
  		return(FALSE);
  	}
  
-@@ -384,18 +423,27 @@
+@@ -383,18 +422,27 @@
  		For the sake of simplicity, give up. */
  		ut_ad(page_zip_get_size(&bpage->zip) < size);
  
@@ -346,8 +346,8 @@
 -	if (buf_page_can_relocate(bpage)) {
 +	if (mutex && buf_page_can_relocate(bpage)) {
  		/* Relocate the compressed page. */
+ 		ullint	usec	= ut_time_us(NULL);
  		ut_a(bpage->zip.data == src);
- 		memcpy(dst, src, size);
 @@ -409,10 +457,22 @@
  			buddy_stat->relocated_usec
  				+= ut_time_us(NULL) - usec;
@@ -1249,10 +1249,10 @@
  
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  	ut_a(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
-@@ -3030,7 +3187,10 @@
+@@ -3031,7 +3188,10 @@
  	buf_page_t*	hash_page;
- 	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
+ 	ut_ad(buf_pool == buf_pool_get(space, offset));
 -	ut_ad(buf_pool_mutex_own(buf_pool));
 +	//ut_ad(buf_pool_mutex_own(buf_pool));
 +#ifdef UNIV_SYNC_DEBUG
@@ -1261,7 +1261,7 @@
  	ut_ad(mutex_own(&(block->mutex)));
  	ut_a(buf_block_get_state(block) != BUF_BLOCK_FILE_PAGE);
  
-@@ -3059,11 +3219,14 @@
+@@ -3060,11 +3220,14 @@
  	if (UNIV_LIKELY(!hash_page)) {
  	} else if (buf_pool_watch_is_sentinel(buf_pool, hash_page)) {
  		/* Preserve the reference count. */
@@ -1277,7 +1277,7 @@
  	} else {
  		fprintf(stderr,
  			"InnoDB: Error: page %lu %lu already found"
-@@ -3073,7 +3236,8 @@
+@@ -3074,7 +3237,8 @@
  			(const void*) hash_page, (const void*) block);
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  		mutex_exit(&block->mutex);
@@ -1287,7 +1287,7 @@
  		buf_print();
  		buf_LRU_print();
  		buf_validate();
-@@ -3156,7 +3320,9 @@
+@@ -3157,7 +3321,9 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -1298,7 +1298,7 @@
  
  	watch_page = buf_page_hash_get_low(buf_pool, space, offset, fold);
  	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
-@@ -3165,9 +3331,15 @@
+@@ -3166,9 +3332,15 @@
  err_exit:
  		if (block) {
  			mutex_enter(&block->mutex);
@@ -1315,16 +1315,16 @@
  
  		bpage = NULL;
  		goto func_exit;
-@@ -3190,6 +3362,8 @@
+@@ -3191,6 +3363,8 @@
  
- 		buf_page_init(space, offset, fold, block);
+ 		buf_page_init(buf_pool, space, offset, fold, block);
  
 +		rw_lock_x_unlock(&buf_pool->page_hash_latch);
 +
  		/* The block must be put to the LRU list, to the old blocks */
  		buf_LRU_add_block(bpage, TRUE/* to old blocks */);
  
-@@ -3217,7 +3391,7 @@
+@@ -3218,7 +3392,7 @@
  			been added to buf_pool->LRU and
  			buf_pool->page_hash. */
  			mutex_exit(&block->mutex);
@@ -1333,7 +1333,7 @@
  			mutex_enter(&block->mutex);
  			block->page.zip.data = data;
  
-@@ -3230,13 +3404,14 @@
+@@ -3231,13 +3405,14 @@
  			buf_unzip_LRU_add_block(block, TRUE);
  		}
  
@@ -1349,7 +1349,7 @@
  
  		/* If buf_buddy_alloc() allocated storage from the LRU list,
  		it released and reacquired buf_pool->mutex.  Thus, we must
-@@ -3252,7 +3427,10 @@
+@@ -3253,7 +3428,10 @@
  
  				/* The block was added by some other thread. */
  				watch_page = NULL;
@@ -1361,7 +1361,7 @@
  
  				bpage = NULL;
  				goto func_exit;
-@@ -3300,20 +3478,26 @@
+@@ -3301,20 +3479,26 @@
  		HASH_INSERT(buf_page_t, hash, buf_pool->page_hash, fold,
  			    bpage);
  
@@ -1389,7 +1389,7 @@
  
  	if (mode == BUF_READ_IBUF_PAGES_ONLY) {
  
-@@ -3355,7 +3539,9 @@
+@@ -3356,7 +3540,9 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -1400,7 +1400,7 @@
  
  	block = (buf_block_t*) buf_page_hash_get_low(
  		buf_pool, space, offset, fold);
-@@ -3371,7 +3557,9 @@
+@@ -3372,7 +3558,9 @@
  #endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  
  		/* Page can be found in buf_pool */
@@ -1411,15 +1411,15 @@
  
  		buf_block_free(free_block);
  
-@@ -3393,6 +3581,7 @@
+@@ -3394,6 +3582,7 @@
  	mutex_enter(&block->mutex);
  
- 	buf_page_init(space, offset, fold, block);
+ 	buf_page_init(buf_pool, space, offset, fold, block);
 +	rw_lock_x_unlock(&buf_pool->page_hash_latch);
  
  	/* The block must be put to the LRU list */
  	buf_LRU_add_block(&block->page, FALSE);
-@@ -3419,7 +3608,7 @@
+@@ -3420,7 +3609,7 @@
  		the reacquisition of buf_pool->mutex.  We also must
  		defer this operation until after the block descriptor
  		has been added to buf_pool->LRU and buf_pool->page_hash. */
@@ -1428,7 +1428,7 @@
  		mutex_enter(&block->mutex);
  		block->page.zip.data = data;
  
-@@ -3437,7 +3626,8 @@
+@@ -3438,7 +3627,8 @@
  
  	buf_page_set_accessed(&block->page, time_ms);
  
@@ -1438,7 +1438,35 @@
  
  	mtr_memo_push(mtr, block, MTR_MEMO_BUF_FIX);
  
-@@ -3488,6 +3678,8 @@
+@@ -3493,7 +3683,9 @@
+ 	ibool		ret = TRUE;
+ 
+ 	/* First unfix and release lock on the bpage */
+-	buf_pool_mutex_enter(buf_pool);
++	//buf_pool_mutex_enter(buf_pool);
++	mutex_enter(&buf_pool->LRU_list_mutex);
++	rw_lock_x_lock(&buf_pool->page_hash_latch);
+ 	mutex_enter(buf_page_get_mutex(bpage));
+ 	ut_ad(buf_page_get_io_fix(bpage) == BUF_IO_READ);
+ 	ut_ad(bpage->buf_fix_count == 0);
+@@ -3514,11 +3706,15 @@
+ 		ret = FALSE;
+ 	}
+ 
++	buf_pool_mutex_enter(buf_pool);
+ 	ut_ad(buf_pool->n_pend_reads > 0);
+ 	buf_pool->n_pend_reads--;
++	buf_pool_mutex_exit(buf_pool);
+ 
+ 	mutex_exit(buf_page_get_mutex(bpage));
+-	buf_pool_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);
+ 
+ 	return(ret);
+ }
+@@ -3536,6 +3732,8 @@
  	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
  	const ibool	uncompressed = (buf_page_get_state(bpage)
  					== BUF_BLOCK_FILE_PAGE);
@@ -1447,7 +1475,7 @@
  
  	ut_a(buf_page_in_file(bpage));
  
-@@ -3621,8 +3813,26 @@
+@@ -3678,8 +3876,26 @@
  		}
  	}
  
@@ -1475,7 +1503,7 @@
  
  #ifdef UNIV_IBUF_COUNT_DEBUG
  	if (io_type == BUF_IO_WRITE || uncompressed) {
-@@ -3645,6 +3855,7 @@
+@@ -3702,6 +3918,7 @@
  		the x-latch to this OS thread: do not let this confuse you in
  		debugging! */
  
@@ -1483,7 +1511,7 @@
  		ut_ad(buf_pool->n_pend_reads > 0);
  		buf_pool->n_pend_reads--;
  		buf_pool->stat.n_pages_read++;
-@@ -3662,6 +3873,9 @@
+@@ -3719,6 +3936,9 @@
  
  		buf_flush_write_complete(bpage);
  
@@ -1493,7 +1521,7 @@
  		if (uncompressed) {
  			rw_lock_s_unlock_gen(&((buf_block_t*) bpage)->lock,
  					     BUF_IO_WRITE);
-@@ -3684,8 +3898,8 @@
+@@ -3741,8 +3961,8 @@
  	}
  #endif /* UNIV_DEBUG */
  
@@ -1503,7 +1531,7 @@
  }
  
  /*********************************************************************//**
-@@ -3702,7 +3916,9 @@
+@@ -3759,7 +3979,9 @@
  
  	ut_ad(buf_pool);
  
@@ -1514,7 +1542,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -3719,7 +3935,9 @@
+@@ -3776,7 +3998,9 @@
  		}
  	}
  
@@ -1525,7 +1553,7 @@
  
  	return(TRUE);
  }
-@@ -3767,7 +3985,8 @@
+@@ -3824,7 +4048,8 @@
  		freed = buf_LRU_search_and_free_block(buf_pool, 100);
  	}
  
@@ -1535,7 +1563,7 @@
  
  	ut_ad(UT_LIST_GET_LEN(buf_pool->LRU) == 0);
  	ut_ad(UT_LIST_GET_LEN(buf_pool->unzip_LRU) == 0);
-@@ -3780,7 +3999,8 @@
+@@ -3837,7 +4062,8 @@
  	memset(&buf_pool->stat, 0x00, sizeof(buf_pool->stat));
  	buf_refresh_io_stats(buf_pool);
  
@@ -1545,7 +1573,7 @@
  }
  
  /*********************************************************************//**
-@@ -3822,7 +4042,10 @@
+@@ -3879,7 +4105,10 @@
  
  	ut_ad(buf_pool);
  
@@ -1557,7 +1585,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -3917,7 +4140,7 @@
+@@ -3974,7 +4203,7 @@
  	/* Check clean compressed-only blocks. */
  
  	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
@@ -1566,7 +1594,7 @@
  		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
  		switch (buf_page_get_io_fix(b)) {
  		case BUF_IO_NONE:
-@@ -3948,7 +4171,7 @@
+@@ -4005,7 +4234,7 @@
  
  	buf_flush_list_mutex_enter(buf_pool);
  	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
@@ -1575,7 +1603,7 @@
  		ut_ad(b->in_flush_list);
  		ut_a(b->oldest_modification);
  		n_flush++;
-@@ -4007,6 +4230,8 @@
+@@ -4064,6 +4293,8 @@
  	}
  
  	ut_a(UT_LIST_GET_LEN(buf_pool->LRU) == n_lru);
@@ -1584,7 +1612,7 @@
  	if (UT_LIST_GET_LEN(buf_pool->free) != n_free) {
  		fprintf(stderr, "Free list len %lu, free blocks %lu\n",
  			(ulong) UT_LIST_GET_LEN(buf_pool->free),
-@@ -4017,8 +4242,11 @@
+@@ -4074,8 +4305,11 @@
  	ut_a(buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE] == n_single_flush);
  	ut_a(buf_pool->n_flush[BUF_FLUSH_LIST] == n_list_flush);
  	ut_a(buf_pool->n_flush[BUF_FLUSH_LRU] == n_lru_flush);
@@ -1597,7 +1625,7 @@
  
  	ut_a(buf_LRU_validate());
  	ut_a(buf_flush_validate(buf_pool));
-@@ -4074,7 +4302,9 @@
+@@ -4131,7 +4365,9 @@
  	index_ids = mem_alloc(size * sizeof *index_ids);
  	counts = mem_alloc(sizeof(ulint) * size);
  
@@ -1608,7 +1636,7 @@
  	buf_flush_list_mutex_enter(buf_pool);
  
  	fprintf(stderr,
-@@ -4143,7 +4373,9 @@
+@@ -4200,7 +4436,9 @@
  		}
  	}
  
@@ -1619,7 +1647,7 @@
  
  	for (i = 0; i < n_found; i++) {
  		index = dict_index_get_if_in_cache(index_ids[i]);
-@@ -4200,7 +4432,7 @@
+@@ -4257,7 +4495,7 @@
  	buf_chunk_t*	chunk;
  	ulint		fixed_pages_number = 0;
  
@@ -1628,7 +1656,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -4234,7 +4466,7 @@
+@@ -4291,7 +4529,7 @@
  	/* Traverse the lists of clean and dirty compressed-only blocks. */
  
  	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
@@ -1637,7 +1665,7 @@
  		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
  		ut_a(buf_page_get_io_fix(b) != BUF_IO_WRITE);
  
-@@ -4246,7 +4478,7 @@
+@@ -4303,7 +4541,7 @@
  
  	buf_flush_list_mutex_enter(buf_pool);
  	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
@@ -1646,7 +1674,7 @@
  		ut_ad(b->in_flush_list);
  
  		switch (buf_page_get_state(b)) {
-@@ -4272,7 +4504,7 @@
+@@ -4329,7 +4567,7 @@
  
  	buf_flush_list_mutex_exit(buf_pool);
  	mutex_exit(&buf_pool->zip_mutex);
@@ -1655,7 +1683,7 @@
  
  	return(fixed_pages_number);
  }
-@@ -4430,6 +4662,8 @@
+@@ -4487,6 +4725,8 @@
  	/* Find appropriate pool_info to store stats for this buffer pool */
  	pool_info = &all_pool_info[pool_id];
  
@@ -1664,7 +1692,7 @@
  	buf_pool_mutex_enter(buf_pool);
  	buf_flush_list_mutex_enter(buf_pool);
  
-@@ -4545,6 +4779,8 @@
+@@ -4602,6 +4842,8 @@
  	pool_info->unzip_cur = buf_LRU_stat_cur.unzip;
  
  	buf_refresh_io_stats(buf_pool);
@@ -1673,7 +1701,7 @@
  	buf_pool_mutex_exit(buf_pool);
  }
  
-@@ -4789,11 +5025,13 @@
+@@ -4846,11 +5088,13 @@
  {
  	ulint	len;
  
@@ -1863,7 +1891,7 @@
  	ut_ad(buf_flush_ready_for_flush(bpage, flush_type));
  
  	buf_page_set_io_fix(bpage, BUF_IO_WRITE);
-@@ -1429,14 +1439,16 @@
+@@ -1453,14 +1463,16 @@
  
  		buf_pool = buf_pool_get(space, i);
  
@@ -1879,10 +1907,10 @@
 -			buf_pool_mutex_exit(buf_pool);
 +			//buf_pool_mutex_exit(buf_pool);
 +			rw_lock_s_unlock(&buf_pool->page_hash_latch);
- 			continue;
- 		}
- 
-@@ -1448,11 +1460,9 @@
+ 			/* not contiguous */
+ 			if (srv_flush_neighbor_pages == 2) {
+ 				break;
+@@ -1476,11 +1488,9 @@
  		if (flush_type != BUF_FLUSH_LRU
  		    || i == offset
  		    || buf_page_is_old(bpage)) {
@@ -1896,9 +1924,9 @@
  			    && (i == offset || !bpage->buf_fix_count)) {
  				/* We only try to flush those
  				neighbors != offset where the buf fix
-@@ -1468,11 +1478,12 @@
- 				ut_ad(!buf_pool_mutex_own(buf_pool));
+@@ -1497,11 +1507,12 @@
  				count++;
+ 				/* contiguous */
  				continue;
 -			} else {
 +			} else if (block_mutex) {
@@ -1908,10 +1936,10 @@
 -		buf_pool_mutex_exit(buf_pool);
 +		//buf_pool_mutex_exit(buf_pool);
 +		rw_lock_s_unlock(&buf_pool->page_hash_latch);
- 	}
  
- 	return(count);
-@@ -1505,21 +1516,25 @@
+ 		/* not contiguous */
+ 		if (srv_flush_neighbor_pages == 2) {
+@@ -1546,21 +1557,25 @@
  	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
  #endif /* UNIV_DEBUG */
  
@@ -1943,7 +1971,7 @@
  
  		/* These fields are protected by both the
  		buffer pool mutex and block mutex. */
-@@ -1535,13 +1550,18 @@
+@@ -1576,13 +1591,18 @@
  						  *count,
  						  n_to_flush);
  
@@ -1965,7 +1993,7 @@
  
  	return(flushed);
  }
-@@ -1562,7 +1582,8 @@
+@@ -1603,7 +1623,8 @@
  	buf_page_t*	bpage;
  	ulint		count = 0;
  
@@ -1975,7 +2003,7 @@
  
  	do {
  		/* Start from the end of the list looking for a
-@@ -1584,7 +1605,8 @@
+@@ -1625,7 +1646,8 @@
  	should be flushed, we factor in this value. */
  	buf_lru_flush_page_count += count;
  
@@ -1985,7 +2013,7 @@
  
  	return(count);
  }
-@@ -1612,9 +1634,10 @@
+@@ -1653,9 +1675,10 @@
  {
  	ulint		len;
  	buf_page_t*	bpage;
@@ -1997,7 +2025,7 @@
  
  	/* If we have flushed enough, leave the loop */
  	do {
-@@ -1633,6 +1656,7 @@
+@@ -1674,6 +1697,7 @@
  
  		if (bpage) {
  			ut_a(bpage->oldest_modification > 0);
@@ -2005,7 +2033,7 @@
  		}
  
  		if (!bpage || bpage->oldest_modification >= lsn_limit) {
-@@ -1674,9 +1698,17 @@
+@@ -1715,9 +1739,17 @@
  				break;
  			}
  
@@ -2025,7 +2053,7 @@
  
  			buf_flush_list_mutex_exit(buf_pool);
  
-@@ -1685,7 +1717,7 @@
+@@ -1726,7 +1758,7 @@
  
  	} while (count < min_n && bpage != NULL && len > 0);
  
@@ -2034,7 +2062,7 @@
  
  	return(count);
  }
-@@ -1724,13 +1756,15 @@
+@@ -1765,13 +1797,15 @@
  	      || sync_thread_levels_empty_except_dict());
  #endif /* UNIV_SYNC_DEBUG */
  
@@ -2051,7 +2079,7 @@
  		break;
  	case BUF_FLUSH_LIST:
  		count = buf_flush_flush_list_batch(buf_pool, min_n, lsn_limit);
-@@ -1739,7 +1773,7 @@
+@@ -1780,7 +1814,7 @@
  		ut_error;
  	}
  
@@ -2060,7 +2088,7 @@
  
  	buf_flush_buffered_writes();
  
-@@ -1995,7 +2029,7 @@
+@@ -2049,7 +2083,7 @@
  retry:
  	//buf_pool_mutex_enter(buf_pool);
  	if (have_LRU_mutex)
@@ -2069,7 +2097,7 @@
  
  	n_replaceable = UT_LIST_GET_LEN(buf_pool->free);
  
-@@ -2012,15 +2046,15 @@
+@@ -2066,15 +2100,15 @@
  			bpage = UT_LIST_GET_LAST(buf_pool->LRU);
  			continue;
  		}
@@ -2090,7 +2118,7 @@
  
  		distance++;
  
-@@ -2029,7 +2063,7 @@
+@@ -2083,7 +2117,7 @@
  
  	//buf_pool_mutex_exit(buf_pool);
  	if (have_LRU_mutex)
@@ -2099,7 +2127,7 @@
  
  	if (n_replaceable >= BUF_FLUSH_FREE_BLOCK_MARGIN(buf_pool)) {
  
-@@ -2228,7 +2262,7 @@
+@@ -2282,7 +2316,7 @@
  
  	ut_ad(buf_flush_list_mutex_own(buf_pool));
  
@@ -2108,7 +2136,7 @@
  			 ut_ad(ut_list_node_313->in_flush_list));
  
  	bpage = UT_LIST_GET_FIRST(buf_pool->flush_list);
-@@ -2268,7 +2302,7 @@
+@@ -2322,7 +2356,7 @@
  			rnode = rbt_next(buf_pool->flush_rbt, rnode);
  		}
  
@@ -2953,8 +2981,17 @@
 +	buf_LRU_block_free_non_file_page(block, have_page_hash_mutex);
  }
  
- /**********************************************************************//**
-@@ -1909,7 +2063,8 @@
+ /******************************************************************//**
+@@ -1897,7 +2051,7 @@
+ {
+ 	if (buf_LRU_block_remove_hashed_page(bpage, TRUE)
+ 	    != BUF_BLOCK_ZIP_FREE) {
+-		buf_LRU_block_free_hashed_page((buf_block_t*) bpage);
++		buf_LRU_block_free_hashed_page((buf_block_t*) bpage, TRUE);
+ 	}
+ }
+ 
+@@ -1925,7 +2079,8 @@
  	}
  
  	if (adjust) {
@@ -2964,7 +3001,7 @@
  
  		if (ratio != buf_pool->LRU_old_ratio) {
  			buf_pool->LRU_old_ratio = ratio;
-@@ -1921,7 +2076,8 @@
+@@ -1937,7 +2092,8 @@
  			}
  		}
  
@@ -2974,7 +3011,7 @@
  	} else {
  		buf_pool->LRU_old_ratio = ratio;
  	}
-@@ -2026,7 +2182,8 @@
+@@ -2042,7 +2198,8 @@
  	ulint		new_len;
  
  	ut_ad(buf_pool);
@@ -2984,7 +3021,7 @@
  
  	if (UT_LIST_GET_LEN(buf_pool->LRU) >= BUF_LRU_OLD_MIN_LEN) {
  
-@@ -2087,16 +2244,22 @@
+@@ -2103,16 +2260,22 @@
  
  	ut_a(buf_pool->LRU_old_len == old_len);
  
@@ -3009,7 +3046,7 @@
  	UT_LIST_VALIDATE(unzip_LRU, buf_block_t, buf_pool->unzip_LRU,
  			 ut_ad(ut_list_node_313->in_unzip_LRU_list
  			       && ut_list_node_313->page.in_LRU_list));
-@@ -2110,7 +2273,8 @@
+@@ -2126,7 +2289,8 @@
  		ut_a(buf_page_belongs_to_unzip_LRU(&block->page));
  	}
  
@@ -3019,7 +3056,7 @@
  }
  
  /**********************************************************************//**
-@@ -2146,7 +2310,8 @@
+@@ -2162,7 +2326,8 @@
  	const buf_page_t*	bpage;
  
  	ut_ad(buf_pool);
@@ -3029,7 +3066,7 @@
  
  	bpage = UT_LIST_GET_FIRST(buf_pool->LRU);
  
-@@ -2203,7 +2368,8 @@
+@@ -2219,7 +2384,8 @@
  		bpage = UT_LIST_GET_NEXT(LRU, bpage);
  	}
  
@@ -3279,7 +3316,7 @@
  Creates the buffer pool.
  @return	own: buf_pool object, NULL if not enough memory or error */
  UNIV_INTERN
-@@ -889,6 +903,15 @@
+@@ -864,6 +878,15 @@
  	const buf_page_t*	bpage)	/*!< in: pointer to control block */
  	__attribute__((pure));
  
@@ -3295,7 +3332,7 @@
  /*********************************************************************//**
  Get the flush type of a page.
  @return	flush type */
-@@ -1370,7 +1393,7 @@
+@@ -1345,7 +1368,7 @@
  	All these are protected by buf_pool->mutex. */
  	/* @{ */
  
@@ -3304,7 +3341,7 @@
  					/*!< based on state, this is a
  					list node, protected either by
  					buf_pool->mutex or by
-@@ -1398,6 +1421,10 @@
+@@ -1373,6 +1396,10 @@
  					BUF_BLOCK_REMOVE_HASH or
  					BUF_BLOCK_READY_IN_USE. */
  
@@ -3315,7 +3352,7 @@
  #ifdef UNIV_DEBUG
  	ibool		in_flush_list;	/*!< TRUE if in buf_pool->flush_list;
  					when buf_pool->flush_list_mutex is
-@@ -1490,11 +1517,11 @@
+@@ -1465,11 +1492,11 @@
  					a block is in the unzip_LRU list
  					if page.state == BUF_BLOCK_FILE_PAGE
  					and page.zip.data != NULL */
@@ -3329,7 +3366,7 @@
  	mutex_t		mutex;		/*!< mutex protecting this block:
  					state (also protected by the buffer
  					pool mutex), io_fix, buf_fix_count,
-@@ -1671,6 +1698,11 @@
+@@ -1646,6 +1673,11 @@
  					pool instance, protects compressed
  					only pages (of type buf_page_t, not
  					buf_block_t */
@@ -3341,7 +3378,7 @@
  	ulint		instance_no;	/*!< Array index of this buffer
  					pool instance */
  	ulint		old_pool_size;  /*!< Old pool size in bytes */
-@@ -1824,8 +1856,8 @@
+@@ -1799,8 +1831,8 @@
  /** Test if a buffer pool mutex is owned. */
  #define buf_pool_mutex_own(b) mutex_own(&b->mutex)
  /** Acquire a buffer pool mutex. */
@@ -3529,7 +3566,7 @@
  	       && (block->page.buf_fix_count == 0))
  	      || rw_lock_own(&(block->lock), RW_LOCK_EXCLUSIVE));
  #endif /* UNIV_SYNC_DEBUG */
-@@ -1013,7 +1044,11 @@
+@@ -1026,7 +1057,11 @@
  	buf_page_t*	bpage;
  
  	ut_ad(buf_pool);
@@ -3542,7 +3579,7 @@
  	ut_ad(fold == buf_page_address_fold(space, offset));
  
  	/* Look for the page in the hash table */
-@@ -1098,11 +1133,13 @@
+@@ -1111,11 +1146,13 @@
  	const buf_page_t*	bpage;
  	buf_pool_t*		buf_pool = buf_pool_get(space, offset);
  
@@ -3558,7 +3595,7 @@
  
  	return(bpage != NULL);
  }
-@@ -1230,4 +1267,38 @@
+@@ -1243,4 +1280,38 @@
  		buf_pool_mutex_exit(buf_pool);
  	}
  }
@@ -3643,7 +3680,7 @@
  extern mysql_pfs_key_t	cache_last_read_mutex_key;
  extern mysql_pfs_key_t	dict_foreign_err_mutex_key;
  extern mysql_pfs_key_t	dict_sys_mutex_key;
-@@ -670,7 +674,7 @@
+@@ -667,7 +671,7 @@
  #define SYNC_TRX_SYS_HEADER	290
  #define	SYNC_PURGE_QUEUE	200
  #define SYNC_LOG		170
@@ -3652,7 +3689,7 @@
  #define SYNC_RECV		168
  #define	SYNC_WORK_QUEUE		162
  #define	SYNC_SEARCH_SYS_CONF	161	/* for assigning btr_search_enabled */
-@@ -680,8 +684,13 @@
+@@ -677,8 +681,13 @@
  					SYNC_SEARCH_SYS, as memory allocation
  					can call routines there! Otherwise
  					the level is SYNC_MEM_HASH. */
@@ -3667,7 +3704,7 @@
  #define	SYNC_BUF_FLUSH_LIST	145	/* Buffer flush list mutex */
  #define SYNC_DOUBLEWRITE	140
  #define	SYNC_ANY_LATCH		135
-@@ -713,7 +722,7 @@
+@@ -709,7 +718,7 @@
  		os_fast_mutex;	/*!< We use this OS mutex in place of lock_word
  				when atomic operations are not enabled */
  #endif
@@ -3731,7 +3768,7 @@
  }
  
  /******************************************************************//**
-@@ -1239,7 +1249,12 @@
+@@ -1234,7 +1244,12 @@
  			ut_error;
  		}
  		break;
@@ -3744,7 +3781,7 @@
  	case SYNC_BUF_POOL:
  		/* We can have multiple mutexes of this type therefore we
  		can only check whether the greater than condition holds. */
-@@ -1257,7 +1272,8 @@
+@@ -1252,7 +1267,8 @@
  		buffer block (block->mutex or buf_pool->zip_mutex). */
  		if (!sync_thread_levels_g(array, level, FALSE)) {
  			ut_a(sync_thread_levels_g(array, level - 1, TRUE));

=== modified file 'patches/innodb_stats.patch'
--- patches/innodb_stats.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_stats.patch	2011-11-02 10:38:52 +0000
@@ -356,7 +356,7 @@
  	}
  
  	return(table);
-@@ -4343,6 +4343,295 @@
+@@ -4344,6 +4344,295 @@
  }
  
  /*********************************************************************//**
@@ -652,7 +652,7 @@
  Calculates new estimates for table and index statistics. The statistics
  are used in query optimization. */
  UNIV_INTERN
-@@ -4350,10 +4639,11 @@
+@@ -4351,10 +4640,11 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -665,7 +665,7 @@
  {
  	dict_index_t*	index;
  	ulint		sum_of_index_sizes	= 0;
-@@ -4370,6 +4660,27 @@
+@@ -4371,6 +4661,27 @@
  		return;
  	}
  
@@ -693,7 +693,7 @@
  	/* Find out the sizes of the indexes and how many different values
  	for the key they approximately have */
  
-@@ -4434,6 +4745,11 @@
+@@ -4435,6 +4746,11 @@
  		index = dict_table_get_next_index(index);
  	} while (index);
  
@@ -705,7 +705,7 @@
  	index = dict_table_get_first_index(table);
  
  	table->stat_n_rows = index->stat_n_diff_key_vals[
-@@ -4451,6 +4767,78 @@
+@@ -4452,6 +4768,78 @@
  	dict_table_stats_unlock(table, RW_X_LATCH);
  }
  
@@ -784,7 +784,7 @@
  /**********************************************************************//**
  Prints info of a foreign key constraint. */
  static
-@@ -4528,7 +4916,8 @@
+@@ -4529,7 +4917,8 @@
  
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -804,9 +804,9 @@
 +	"SYS_FOREIGN_COLS",
 +	"SYS_STATS"
  };
- /****************************************************************//**
- Compare the name of an index column.
-@@ -343,12 +344,13 @@
+ 
+ /* If this flag is TRUE, then we will load the cluster index's (and tables')
+@@ -348,12 +349,13 @@
  	}
  
  	if ((status & DICT_TABLE_UPDATE_STATS)
@@ -821,7 +821,7 @@
  	}
  
  	return(NULL);
-@@ -582,6 +584,75 @@
+@@ -587,6 +589,75 @@
  //#endif  /* FOREIGN_NOT_USED */
  
  /********************************************************************//**
@@ -907,7 +907,7 @@
  
  
  static char*	internal_innobase_data_file_path	= NULL;
-@@ -2441,6 +2442,8 @@
+@@ -2468,6 +2469,8 @@
  		goto error;
  	}
  
@@ -916,7 +916,7 @@
  	/* -------------- Log files ---------------------------*/
  
  	/* The default dir for log files is the datadir of MySQL */
-@@ -5230,6 +5233,10 @@
+@@ -5257,6 +5260,10 @@
  
  	error = row_insert_for_mysql((byte*) record, prebuilt);
  
@@ -927,7 +927,7 @@
  	/* Handle duplicate key errors */
  	if (auto_inc_used) {
  		ulint		err;
-@@ -5566,6 +5573,10 @@
+@@ -5593,6 +5600,10 @@
  		}
  	}
  
@@ -938,7 +938,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(error,
-@@ -5619,6 +5630,10 @@
+@@ -5646,6 +5657,10 @@
  
  	error = row_update_for_mysql((byte*) record, prebuilt);
  
@@ -949,7 +949,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(
-@@ -5937,6 +5952,11 @@
+@@ -5966,6 +5981,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -961,7 +961,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_KEY_NOT_FOUND;
-@@ -6146,6 +6166,11 @@
+@@ -6198,6 +6218,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -973,7 +973,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_END_OF_FILE;
-@@ -8088,11 +8113,35 @@
+@@ -8144,11 +8169,35 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
@@ -1010,7 +1010,7 @@
  
  			prebuilt->trx->op_info = "returning various info to MySQL";
  		}
-@@ -8177,7 +8226,7 @@
+@@ -8233,7 +8282,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. */
@@ -1019,7 +1019,7 @@
  		    || !(flag & HA_STATUS_VARIABLE_EXTRA)) {
  			/* We do not update delete_length if no
  			locking is requested so the "old" value can
-@@ -11391,6 +11440,26 @@
+@@ -11503,6 +11552,26 @@
    "The number of index pages to sample when calculating statistics (default 8)",
    NULL, NULL, 8, 1, ~0ULL, 0);
  
@@ -1046,7 +1046,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
    PLUGIN_VAR_OPCMDARG,
    "Enable InnoDB adaptive hash index (enabled by default).  "
-@@ -11722,6 +11791,9 @@
+@@ -11861,6 +11930,9 @@
    MYSQL_SYSVAR(recovery_update_relay_log),
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
@@ -1056,7 +1056,7 @@
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
    MYSQL_SYSVAR(stats_method),
-@@ -11793,7 +11865,10 @@
+@@ -11932,7 +12004,10 @@
  i_s_innodb_sys_columns,
  i_s_innodb_sys_fields,
  i_s_innodb_sys_foreign,
@@ -1682,8 +1682,8 @@
 +#define	DICT_HDR_XTRADB_MARK	256	/* Flag to distinguish expansion of XtraDB */
  /*-------------------------------------------------------------*/
  
- /* The field number of the page number field in the sys_indexes table
-@@ -144,11 +148,16 @@
+ /* The field numbers in the SYS_TABLES clustered index */
+@@ -146,11 +150,16 @@
  #define DICT_SYS_INDEXES_TYPE_FIELD	 6
  #define DICT_SYS_INDEXES_NAME_FIELD	 4
  
@@ -1757,7 +1757,7 @@
  #include "dict0crea.ic"
 --- a/storage/innobase/include/dict0dict.h
 +++ b/storage/innobase/include/dict0dict.h
-@@ -1109,10 +1109,18 @@
+@@ -1126,10 +1126,18 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -1777,7 +1777,7 @@
  /********************************************************************//**
  Reserves the dictionary system mutex for MySQL. */
  UNIV_INTERN
-@@ -1227,6 +1235,7 @@
+@@ -1244,6 +1252,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 */
@@ -1854,7 +1854,7 @@
  should be called after the indexes for a table have been created.
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -212,6 +212,9 @@
+@@ -216,6 +216,9 @@
  extern ibool	srv_innodb_status;
  
  extern unsigned long long	srv_stats_sample_pages;
@@ -1908,7 +1908,7 @@
  	} else {
 --- a/storage/innobase/row/row0ins.c
 +++ b/storage/innobase/row/row0ins.c
-@@ -2013,6 +2013,8 @@
+@@ -2015,6 +2015,8 @@
  	}
  
  #ifdef UNIV_DEBUG
@@ -1930,7 +1930,7 @@
  		/* Drop the index definition and the B-tree. */
 --- a/storage/innobase/row/row0mysql.c
 +++ b/storage/innobase/row/row0mysql.c
-@@ -921,6 +921,9 @@
+@@ -922,6 +922,9 @@
  
  	table->stat_modified_counter = counter + 1;
  
@@ -1940,7 +1940,7 @@
  	/* Calculate new statistics if 1 / 16 of table has been modified
  	since the last time a statistics batch was run, or if
  	stat_modified_counter > 2 000 000 000 (to avoid wrap-around).
-@@ -931,7 +934,7 @@
+@@ -932,7 +935,7 @@
  	    || ((ib_int64_t)counter > 16 + table->stat_n_rows / 16)) {
  
  		dict_update_statistics(table, FALSE /* update even if stats
@@ -1949,7 +1949,7 @@
  	}
  }
  
-@@ -2076,6 +2079,71 @@
+@@ -2077,6 +2080,71 @@
  }
  
  /*********************************************************************//**
@@ -2021,7 +2021,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.
-@@ -3000,7 +3068,7 @@
+@@ -3001,7 +3069,7 @@
  	dict_table_autoinc_initialize(table, 1);
  	dict_table_autoinc_unlock(table);
  	dict_update_statistics(table, FALSE /* update even if stats are
@@ -2030,7 +2030,7 @@
  
  	trx_commit_for_mysql(trx);
  
-@@ -3302,6 +3370,8 @@
+@@ -3312,6 +3380,8 @@
  			   "       IF (SQL % NOTFOUND) THEN\n"
  			   "               found := 0;\n"
  			   "       ELSE\n"
@@ -2041,7 +2041,7 @@
  			   "               DELETE FROM SYS_INDEXES\n"
 --- a/storage/innobase/row/row0row.c
 +++ b/storage/innobase/row/row0row.c
-@@ -373,6 +373,14 @@
+@@ -364,6 +364,14 @@
  
  	rec_len = rec_offs_n_fields(offsets);
  
@@ -2056,7 +2056,7 @@
  	entry = dtuple_create(heap, rec_len);
  
  	dtuple_set_n_fields_cmp(entry,
-@@ -384,6 +392,14 @@
+@@ -375,6 +383,14 @@
  	for (i = 0; i < rec_len; i++) {
  
  		dfield = dtuple_get_nth_field(entry, i);
@@ -2119,12 +2119,12 @@
  UNIV_INTERN ibool	srv_use_checksums = TRUE;
 --- a/storage/innobase/trx/trx0rec.c
 +++ b/storage/innobase/trx/trx0rec.c
-@@ -669,15 +669,27 @@
+@@ -669,14 +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);
@@ -2135,8 +2135,7 @@
 +		    && index == UT_LIST_GET_FIRST(dict_sys->sys_stats->indexes)) {
 +			for (i = 0; i < upd_get_n_fields(update); i++) {
 +				ulint	pos = upd_get_nth_field(update, i)->field_no;
- 
--		for (i = 0; i < upd_get_n_fields(update); i++) {
++
 +				if (pos >= rec_offs_n_fields(offsets)) {
 +					extended++;
 +				}
@@ -2144,7 +2143,8 @@
 +		}
 +
 +		ptr += mach_write_compressed(ptr, upd_get_n_fields(update) - extended);
-+
+ 
+-		for (i = 0; i < upd_get_n_fields(update); i++) {
 +		for (i = 0; i < upd_get_n_fields(update) - extended; i++) {
  
  			ulint	pos = upd_get_nth_field(update, i)->field_no;

=== modified file 'patches/innodb_thread_concurrency_timer_based.patch'
--- patches/innodb_thread_concurrency_timer_based.patch	2011-09-21 09:20:58 +0000
+++ patches/innodb_thread_concurrency_timer_based.patch	2011-11-02 10:38:52 +0000
@@ -15,7 +15,7 @@
  static long long innobase_buffer_pool_size, innobase_log_file_size;
  
  /** Percentage of the buffer pool to reserve for 'old' blocks.
-@@ -2550,6 +2551,9 @@
+@@ -2577,6 +2578,9 @@
  	srv_n_log_files = (ulint) innobase_log_files_in_group;
  	srv_log_file_size = (ulint) innobase_log_file_size;
  
@@ -25,7 +25,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  	srv_log_archive_on = (ulint) innobase_log_archive;
  #endif /* UNIV_LOG_ARCHIVE */
-@@ -11481,6 +11485,12 @@
+@@ -11593,6 +11597,12 @@
    "Maximum delay between polling for a spin lock (6 by default)",
    NULL, NULL, 6L, 0L, ~0L, 0);
  
@@ -38,7 +38,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.",
-@@ -11698,6 +11708,7 @@
+@@ -11837,6 +11847,7 @@
    MYSQL_SYSVAR(spin_wait_delay),
    MYSQL_SYSVAR(table_locks),
    MYSQL_SYSVAR(thread_concurrency),
@@ -48,7 +48,7 @@
    MYSQL_SYSVAR(show_verbose_locks),
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -161,6 +161,8 @@
+@@ -165,6 +165,8 @@
  extern ulint	srv_mem_pool_size;
  extern ulint	srv_lock_table_size;
  

=== modified file 'patches/memory_dynamic_rows.patch'
--- patches/memory_dynamic_rows.patch	2011-09-03 15:15:31 +0000
+++ patches/memory_dynamic_rows.patch	2011-11-02 10:38:52 +0000
@@ -19,7 +19,7 @@
  
  #define HP_MAX_LEVELS	4		/* 128^5 records is enough */
  #define HP_PTRS_IN_NOD	128
-@@ -130,22 +140,58 @@
+@@ -131,22 +141,58 @@
    uint (*get_key_length)(struct st_hp_keydef *keydef, const uchar *key);
  } HP_KEYDEF;
  
@@ -83,9 +83,9 @@
    uint open_count;
 -  uchar *del_link;			/* Link to next block with del. rec */
    char * name;			/* Name of "memory-file" */
+   time_t create_time;
    THR_LOCK lock;
-   mysql_mutex_t intern_lock;            /* Locking for use with _locking */
-@@ -154,6 +200,7 @@
+@@ -156,6 +202,7 @@
    uint auto_key;
    uint auto_key_type;			/* real type of the auto key segment */
    ulonglong auto_increment;
@@ -93,7 +93,7 @@
  } HP_SHARE;
  
  struct st_hp_hash_info;
-@@ -163,7 +210,7 @@
+@@ -165,7 +212,7 @@
    HP_SHARE *s;
    uchar *current_ptr;
    struct st_hp_hash_info *current_hash_ptr;
@@ -102,7 +102,7 @@
    int lastinx,errkey;
    int  mode;				/* Mode of file (READONLY..) */
    uint opt_flag,update;
-@@ -176,6 +223,9 @@
+@@ -178,6 +225,9 @@
    my_bool implicit_emptied;
    THR_LOCK_DATA lock;
    LIST open_list;
@@ -112,7 +112,7 @@
  } HP_INFO;
  
  
-@@ -197,6 +247,14 @@
+@@ -199,6 +249,14 @@
      open_count to 1. Is only looked at if not internal_table.
    */
    my_bool pin_share;
@@ -127,7 +127,7 @@
  } HP_CREATE_INFO;
  
  	/* Prototypes for heap-functions */
-@@ -213,9 +271,8 @@
+@@ -215,9 +273,8 @@
  extern int heap_scan(register HP_INFO *info, uchar *record);
  extern int heap_delete(HP_INFO *info,const uchar *buff);
  extern int heap_info(HP_INFO *info,HEAPINFO *x,int flag);
@@ -318,7 +318,7 @@
    }
  }
  
-@@ -428,6 +435,13 @@
+@@ -429,6 +436,13 @@
    return 0;
  }
  
@@ -332,7 +332,7 @@
  
  int ha_heap::extra(enum ha_extra_function operation)
  {
-@@ -645,23 +659,70 @@
+@@ -646,23 +660,70 @@
  heap_prepare_hp_create_info(TABLE *table_arg, bool internal_table,
                              HP_CREATE_INFO *hp_create_info)
  {
@@ -405,7 +405,7 @@
    seg= reinterpret_cast<HA_KEYSEG*>(keydef + keys);
    for (key= 0; key < keys; key++)
    {
-@@ -677,11 +738,11 @@
+@@ -678,11 +739,11 @@
      case HA_KEY_ALG_UNDEF:
      case HA_KEY_ALG_HASH:
        keydef[key].algorithm= HA_KEY_ALG_HASH;
@@ -419,7 +419,7 @@
        break;
      default:
        DBUG_ASSERT(0); // cannot happen
-@@ -706,6 +767,16 @@
+@@ -707,6 +768,16 @@
        seg->length=  (uint) key_part->length;
        seg->flag=    key_part->key_part_flag;
  
@@ -436,7 +436,7 @@
        if (field->flags & (ENUM_FLAG | SET_FLAG))
          seg->charset= &my_charset_bin;
        else
-@@ -731,9 +802,75 @@
+@@ -732,9 +803,75 @@
          auto_key= key+ 1;
  	auto_key_type= field->key_type();
        }
@@ -513,7 +513,7 @@
    if (table_arg->found_next_number_field)
    {
      keydef[share->next_number_index].flag|= HA_AUTO_KEY;
-@@ -744,16 +881,19 @@
+@@ -745,16 +882,19 @@
    hp_create_info->max_table_size=current_thd->variables.max_heap_table_size;
    hp_create_info->with_auto_increment= found_real_auto_increment;
    hp_create_info->internal_table= internal_table;
@@ -539,7 +539,7 @@
    return 0;
  }
  
-@@ -773,6 +913,7 @@
+@@ -774,6 +914,7 @@
  				  create_info->auto_increment_value - 1 : 0);
    error= heap_create(name, &hp_create_info, &internal_share, &created);
    my_free(hp_create_info.keydef);
@@ -547,7 +547,7 @@
    DBUG_ASSERT(file == 0);
    return (error);
  }
-@@ -783,6 +924,13 @@
+@@ -784,6 +925,13 @@
    table->file->info(HA_STATUS_AUTO);
    if (!(create_info->used_fields & HA_CREATE_USED_AUTO))
      create_info->auto_increment_value= stats.auto_increment_value;
@@ -964,7 +964,7 @@
  	/* Fix keys */
      memcpy(share->keydef, keydef, (size_t) (sizeof(keydef[0]) * keys));
      for (i= 0, keyinfo= share->keydef; i < keys; i++, keyinfo++)
-@@ -177,15 +310,35 @@
+@@ -177,16 +310,36 @@
      share->min_records= min_records;
      share->max_records= max_records;
      share->max_table_size= create_info->max_table_size;
@@ -979,6 +979,7 @@
      share->auto_key= create_info->auto_key;
      share->auto_key_type= create_info->auto_key_type;
      share->auto_increment= create_info->auto_increment;
+     share->create_time= (long) time((time_t*) 0);
 +
 +    share->fixed_data_length= fixed_data_length;
 +    share->fixed_column_count= fixed_column_count;
@@ -1002,7 +1003,7 @@
      /* Must be allocated separately for rename to work */
      if (!(share->name= my_strdup(name,MYF(0))))
      {
-@@ -227,7 +380,7 @@
+@@ -228,7 +381,7 @@
  		    param->search_flag, not_used);
  }
  
@@ -1011,7 +1012,7 @@
  		       ulong max_records)
  {
    uint i,recbuffer,records_in_block;
-@@ -235,7 +388,12 @@
+@@ -236,7 +389,12 @@
    max_records= max(min_records,max_records);
    if (!max_records)
      max_records= 1000;			/* As good as quess as anything */
@@ -3944,7 +3945,7 @@
 +PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
@@ -3955,25 +3956,25 @@
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=123 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=123	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=123	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
@@ -3984,19 +3985,19 @@
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=34	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=121 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=121	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=121	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=1000	
 +DROP TABLE t1;
 --- /dev/null
 +++ b/mysql-test/r/percona_heap_bug784464_32bit.result
@@ -4005,13 +4006,13 @@
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=124 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=122 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
++t1	MEMORY	10	Dynamic	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
 +DROP TABLE t1;
 --- /dev/null
 +++ b/mysql-test/r/percona_heap_bug784464_64bit.result
@@ -4020,13 +4021,13 @@
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=124 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=124	
 +DROP TABLE t1;
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +PRIMARY KEY (f1)) KEY_BLOCK_SIZE=122 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
++t1	MEMORY	10	Fixed	0	X	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC KEY_BLOCK_SIZE=122	
 +DROP TABLE t1;
 --- /dev/null
 +++ b/mysql-test/r/percona_heap_bug784468.result
@@ -4034,17 +4035,17 @@
 +CREATE TABLE t1 ( f1 VARCHAR(30)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	32	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
++t1	MEMORY	10	Fixed	0	32	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
 +DROP TABLE t1;
 +CREATE TABLE t1 ( f1 VARCHAR(31)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	33	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
++t1	MEMORY	10	Fixed	0	33	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
 +DROP TABLE t1;
 +CREATE TABLE t1 ( f1 VARCHAR(32)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
 +SHOW TABLE STATUS LIKE 't1';
 +Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-+t1	MEMORY	10	Fixed	0	34	0	X	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
++t1	MEMORY	10	Fixed	0	34	0	X	0	0	NULL	X	X	NULL	latin1_swedish_ci	NULL	row_format=DYNAMIC	
 +DROP TABLE t1;
 --- /dev/null
 +++ b/mysql-test/r/percona_heap_bug788544.result
@@ -4996,7 +4997,7 @@
 +DROP TABLE local_1_1;
 --- /dev/null
 +++ b/mysql-test/t/percona_heap_bug784464.test
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,66 @@
 +#
 +# Bug #784464: Silent conversion from Dynamic to Fixed row_format for certain
 +# values of key_block_size.
@@ -5005,59 +5006,61 @@
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +--error ER_CANT_USE_OPTION_HERE
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
++--replace_column 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=123 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +--error ER_CANT_USE_OPTION_HERE
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=33 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
++--replace_column 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=34 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=121 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=1000 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
@@ -5070,13 +5073,13 @@
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(32), f3 VARCHAR(32), f4 VARCHAR(32),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=124 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X
 +SHOW TABLE STATUS LIKE 't1';
 +DROP TABLE t1;
 +
 +CREATE TABLE t1 (f1 VARCHAR(32), f2 VARCHAR(96),
 +              	PRIMARY KEY (f1)) KEY_BLOCK_SIZE=122 ENGINE=HEAP ROW_FORMAT=DYNAMIC;
-+--replace_column 6 X 8 X
++--replace_column 6 X 8 X 12 X 13 X