Merge lp:~akopytov/percona-server/ahi-fixes-5.5 into lp:percona-server/5.5

[Alexey Kopytov]

Fixes for bug #1218321, bug #1218330 and bug #1218347.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/847/

[Laurynas Biveinis (laurynas-biveinis)]

    - In percona_bug1218330.test, consider replacing MTR variables
      with SQL variables. Then the need to hide the exact values by
      disable_query_log is removed from the adaptive_hash_mem_2 point
      onwards, resulting in an easier-to-understand test result file.
    - btr_search_info_get_ref_count header comment in btr0sea.c has
      "the ." Also, this header comment should be synced with
      btr0sea.h after editing.
    - It seems that now every index structure in memory create must
      be accompanied by a btr_search_index_init() call. This is OK,
      but I'm wondering if there is any way to merge-proof this
      further. For example, poison index->search_latch and
      search_table pointers in dict_mem_fill_index_struct() if
      UNIV_DEBUG?
    - The ha_innodb.cc conflict needs either you fixing it, if
      possible on GCA, otherwise me fixing it on merge. Note that
      the snippet which was supposed to go to
      innodb_release_stat_resources() went to
      innodb_srv_conc_force_exit_innodb() instead.
    - Why do innobase_release_stat_resources(),
      innobase_commit_ordered(), and innobase_commit() appear to have
      new calls to trx_search_latch_release_if_reserved() added
      anyway, if they are? Or is it a bzr mismerge and only comments
      next to the calls have been added?
    - Diff line 1273: "These latches"
    - It appears that sync_thread_levels_nonempty_trx() is dead code
      now, and all its calls may be replaced by
      sync_thread_levels_nonempty_gen(FALSE).
    - trx->search_latch_timeout now becomes a never-changing constant
      BTR_SEA_TIMEOUT. It can be removed and
      I_S.INNODB_TRX.TRX_ADAPTIVE_HASH_TIMEOUT field can return
      BTR_SEA_TIMEOUT directly, always.
    - Not fully sure but it appears that there are some
      locking/unlocking assymetries wrt UNIV_SEARCH_DEBUG, preceding
      this MP. Not if actionable, probably no need to waste time on
      this. One suspicious example is the target code of
      release_search_latch goto label.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

I forgot that I can just look at the ha_innodb.cc diff on your branch directly. It answered both the ha_innodb.cc-related questions I had, no need to address it in any way, I'll be able to merge GCA to trunk correctly there.

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Wed, 04 Sep 2013 14:50:31 -0000, Laurynas Biveinis wrote:
> Review: Needs Fixing
>
> - In percona_bug1218330.test, consider replacing MTR variables
> with SQL variables. Then the need to hide the exact values by
> disable_query_log is removed from the adaptive_hash_mem_2 point
> onwards, resulting in an easier-to-understand test result file.
> - btr_search_info_get_ref_count header comment in btr0sea.c has
> "the ." Also, this header comment should be synced with
> btr0sea.h after editing.

I considered SQL variables when implementing the test, but preferred MTR
variables, because the .test file is easier to read this way. And the
.result file is for MTR to read.

> - It seems that now every index structure in memory create must
> be accompanied by a btr_search_index_init() call. This is OK,
> but I'm wondering if there is any way to merge-proof this
> further. For example, poison index->search_latch and
> search_table pointers in dict_mem_fill_index_struct() if
> UNIV_DEBUG?

Yes, btr_search_index_init() must be called. The main reason is that
dict_mem_index_create() does not set the index id, it is supposed to be
assigned by the caller and btr_search_index_init() needs an ID.

Now the callers of dict_mem_index_create() do assign an ID in most, but
not all cases. For instance, when a "dummy" index is created, it doesn't
get an ID.

One way to fix that would be to modify dict_mem_index_create() to accept
an ID argument, and make dummy index pass some bogus value (0) as an ID.
But that's almost as fragile as the current approach. Consider a
potential index copy routine that copies an existing index (i.e.
bypassing dict_mem_index_create()) and assigning an ID separately.

I don't see any value in poisoning index->search_latch, as index
structure is created with mem_heap_zalloc(), so if an uninitialized
value is used, we'll know.

> - The ha_innodb.cc conflict needs either you fixing it, if
> possible on GCA, otherwise me fixing it on merge. Note that
> the snippet which was supposed to go to
> innodb_release_stat_resources() went to
> innodb_srv_conc_force_exit_innodb() instead.

Yes, saw the conflict. The reason is that 5.5 GCA tree is behind the
refactoring which made it into the 5.6 tree.

Basically, do what 5.6 code does when merging. It's rather trivial to
resolve.

> - Why do innobase_release_stat_resources(),
> innobase_commit_ordered(), and innobase_commit() appear to have
> new calls to trx_search_latch_release_if_reserved() added
> anyway, if they are? Or is it a bzr mismerge and only comments
> next to the calls have been added?

It's just that the GCA branch has those calls, but they were removed
later. Null-merge those conflicts.

> - Diff line 1273: "These latches"

Oh noes :) But since that is just a "typo in a comment" kind of issue,
and the recommit/merge procedure is quite complicated in this specific
case, I'd keep it as is.

> - It appears that sync_thread_levels_nonempty_trx() is dead code
> now, and all its calls may be...

[Laurynas Biveinis (laurynas-biveinis)]

Alexey -

> > - btr_search_info_get_ref_count header comment in btr0sea.c has
> > "the ." Also, this header comment should be synced with
> > btr0sea.h after editing.

You haven't acknowledged this "oh noes :)" comment. I think I can just fix those typos on trunk merge if a repush is not needed otherwise.

> > - It seems that now every index structure in memory create must
> > be accompanied by a btr_search_index_init() call. This is OK,
> > but I'm wondering if there is any way to merge-proof this
> > further. For example, poison index->search_latch and
> > search_table pointers in dict_mem_fill_index_struct() if
> > UNIV_DEBUG?
...
> I don't see any value in poisoning index->search_latch, as index
> structure is created with mem_heap_zalloc(), so if an uninitialized
> value is used, we'll know.

I guess then index->search_table poisoning is not that needed neither. Thus no need to do anything about poisoning.

> > - It appears that sync_thread_levels_nonempty_trx() is dead code
> > now, and all its calls may be replaced by
> > sync_thread_levels_nonempty_gen(FALSE).
>
> It's not "dead code", it's more a debug validation check that we _think_
> is now unnecessary because on the current code paths we believe
> trx->has_search_latch is always FALSE. We may be wrong. Or code paths
> may change in the future. The more debug checks, the better.

I don't think I fully agree: sync_thread_levels_nonempty_gen(FALSE) is a stricter condition than sync_thread_levels_nonempty_trx(). Thus if we replaced all the calls of the latter with the former, we wouldn't lose any debug checks. The problem of course if we are wrong as you say and may have to add the checks back.

review: Approve

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Fri, 06 Sep 2013 12:46:10 -0000, Laurynas Biveinis wrote:
> Review: Approve
>
> Alexey -
>
>>> - btr_search_info_get_ref_count header comment in btr0sea.c has
>>> "the ." Also, this header comment should be synced with
>>> btr0sea.h after editing.
>
> You haven't acknowledged this "oh noes :)" comment. I think I can just fix those typos on trunk merge if a repush is not needed otherwise.
>

Yes, missed that one. I originally intended to fix all comments to
reflect AHI partitioning, as that introduced unnecessary maintenance
burden. But then I changed my mind and forgot to fully rollback some of
the changes.

=== added file 'Percona-Server/mysql-test/r/percona_bug1218330.result'
--- Percona-Server/mysql-test/r/percona_bug1218330.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1218330.result	2013-09-02 14:07:43 +0000
@@ -0,0 +1,8 @@
+CREATE TABLE t1 (
+a INT PRIMARY KEY, b INT,
+c CHAR(200),
+UNIQUE INDEX b(b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1, 1, REPEAT("a", 200));
+should_be_1
+1
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/t/percona_bug1218330-master.opt'
--- Percona-Server/mysql-test/t/percona_bug1218330-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1218330-master.opt	2013-09-02 14:07:43 +0000
@@ -0,0 +1,1 @@
+--innodb-adaptive-hash-index-partitions=32

=== added file 'Percona-Server/mysql-test/t/percona_bug1218330.test'
--- Percona-Server/mysql-test/t/percona_bug1218330.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1218330.test	2013-09-02 14:07:43 +0000
@@ -0,0 +1,42 @@
+############################################################################
+# Bug #1218330: Adaptive hash index memory is incorrectly calculated in SHOW
+#               ENGINE INNODB STATUS and I_S
+############################################################################
+
+--source include/have_innodb.inc
+
+let $adaptive_hash_mem_1=`SELECT VARIABLE_VALUE FROM
+    INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+    VARIABLE_NAME='Innodb_mem_adaptive_hash'`;
+
+CREATE TABLE t1 (
+       a INT PRIMARY KEY, b INT,
+       c CHAR(200),
+       UNIQUE INDEX b(b)) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (1, 1, REPEAT("a", 200));
+
+--disable_query_log
+
+--let $i=200
+--disable_result_log
+while ($i)
+{
+        SELECT a FROM t1 WHERE a=1;
+        SELECT b FROM t1 WHERE b=1;
+        --dec $i
+}
+--enable_result_log
+
+let $adaptive_hash_mem_2=`SELECT VARIABLE_VALUE FROM
+    INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+    VARIABLE_NAME='Innodb_mem_adaptive_hash'`;
+
+# The original implementation would should identical values in
+# adaptive_hash_mem_1 and adaptive_hash_mem_2
+
+--eval SELECT $adaptive_hash_mem_1 != $adaptive_hash_mem_2 as should_be_1
+
+--enable_query_log
+
+DROP TABLE t1;

=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c	2013-06-27 15:35:20 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c	2013-09-02 14:07:43 +0000
@@ -520,7 +520,8 @@
 #ifdef UNIV_SEARCH_PERF_STAT
 	info->n_searches++;
 #endif
-	if (rw_lock_get_writer(btr_search_get_latch(cursor->index->id)) == RW_LOCK_NOT_LOCKED
+	if (rw_lock_get_writer(btr_search_get_latch(cursor->index)) ==
+	    RW_LOCK_NOT_LOCKED
 	    && latch_mode <= BTR_MODIFY_LEAF
 	    && info->last_hash_succ
 	    && !estimate
@@ -556,7 +557,7 @@
 
 	if (has_search_latch) {
 		/* Release possible search latch to obey latching order */
-		rw_lock_s_unlock(btr_search_get_latch(cursor->index->id));
+		rw_lock_s_unlock(btr_search_get_latch(cursor->index));
 	}
 
 	/* Store the position of the tree latch we push to mtr so that we
@@ -871,7 +872,7 @@
 
 	if (has_search_latch) {
 
-		rw_lock_s_lock(btr_search_get_latch(cursor->index->id));
+		rw_lock_s_lock(btr_search_get_latch(cursor->index));
 	}
 }
 
@@ -2056,13 +2057,13 @@
 			btr_search_update_hash_on_delete(cursor);
 		}
 
-		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_lock(btr_search_get_latch(cursor->index));
 	}
 
 	row_upd_rec_in_place(rec, index, offsets, update, page_zip);
 
 	if (is_hashed) {
-		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_unlock(btr_search_get_latch(cursor->index));
 	}
 
 	if (page_zip && !dict_index_is_clust(index)

=== modified file 'Percona-Server/storage/innobase/btr/btr0sea.c'
--- Percona-Server/storage/innobase/btr/btr0sea.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/btr/btr0sea.c	2013-09-02 14:07:43 +0000
@@ -69,17 +69,14 @@
 cache line as btr_search_latch */
 UNIV_INTERN byte		btr_sea_pad1[64];
 
-/** The latch protecting the adaptive search system: this latch protects the
-(1) positions of records on those pages where a hash index has been built.
-NOTE: It does not protect values of non-ordering fields within a record from
+/** Array of latches protecting individual AHI partitions. The latches
+protect: (1) positions of records on those pages where a hash index from the
+corresponding AHI partition has been built.
+NOTE: They do not protect values of non-ordering fields within a record from
 being updated in-place! We can use fact (1) to perform unique searches to
 indexes. */
 
-/* We will allocate the latch from dynamic memory to get it to the
-same DRAM page as other hotspot semaphores */
-//UNIV_INTERN rw_lock_t*		btr_search_latch_temp;
-
-UNIV_INTERN rw_lock_t**		btr_search_latch_part;
+UNIV_INTERN rw_lock_t*		btr_search_latch_arr;
 
 /** padding to prevent other memory update hotspots from residing on
 the same memory cache line */
@@ -133,17 +130,17 @@
 void
 btr_search_check_free_space_in_heap(
 /*=====================================*/
-	index_id_t	key)
+	dict_index_t*	index)
 {
 	hash_table_t*	table;
 	mem_heap_t*	heap;
 
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_SHARED));
-	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_EX));
+	ut_ad(!rw_lock_own(btr_search_get_latch(index), RW_LOCK_SHARED));
+	ut_ad(!rw_lock_own(btr_search_get_latch(index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
-	table = btr_search_get_hash_index(key);
+	table = btr_search_get_hash_table(index);
 
 	heap = table->heap;
 
@@ -154,7 +151,7 @@
 	if (heap->free_block == NULL) {
 		buf_block_t*	block = buf_block_alloc(NULL);
 
-		rw_lock_x_lock(btr_search_get_latch(key));
+		rw_lock_x_lock(btr_search_get_latch(index));
 
 		if (heap->free_block == NULL) {
 			heap->free_block = block;
@@ -162,7 +159,7 @@
 			buf_block_free(block);
 		}
 
-		rw_lock_x_unlock(btr_search_get_latch(key));
+		rw_lock_x_unlock(btr_search_get_latch(index));
 	}
 }
 
@@ -194,16 +191,19 @@
 
 	btr_search_sys = mem_alloc(sizeof(btr_search_sys_t));
 
-	/* btr_search_index_num should be <= 32. (bits of trx->has_search_latch) */
-	btr_search_latch_part = mem_alloc(sizeof(rw_lock_t*) * btr_search_index_num);
-	btr_search_sys->hash_index = mem_alloc(sizeof(hash_table_t*) * btr_search_index_num);
+	/* btr_search_index_num is constrained to machine word size for
+	historical reasons. This limitation can be easily removed later. */
+
+	btr_search_latch_arr = mem_alloc(sizeof(rw_lock_t) *
+					 btr_search_index_num);
+	btr_search_sys->hash_tables = mem_alloc(sizeof(hash_table_t *) *
+						btr_search_index_num);
 	for (i = 0; i < btr_search_index_num; i++) {
-		btr_search_latch_part[i] = mem_alloc(sizeof(rw_lock_t));
 
 		rw_lock_create(btr_search_latch_key,
-				btr_search_latch_part[i], SYNC_SEARCH_SYS);
+				&btr_search_latch_arr[i], SYNC_SEARCH_SYS);
 
-		btr_search_sys->hash_index[i] = ha_create(hash_size, 0, 0);
+		btr_search_sys->hash_tables[i] = ha_create(hash_size, 0, 0);
 	}
 }
 
@@ -217,15 +217,13 @@
 	ulint i;
 
 	for (i = 0; i < btr_search_index_num; i++) {
-		mem_heap_free(btr_search_sys->hash_index[i]->heap);
-		hash_table_free(btr_search_sys->hash_index[i]);
-
-		rw_lock_free(btr_search_latch_part[i]);
-
-		mem_free(btr_search_latch_part[i]);
+		mem_heap_free(btr_search_sys->hash_tables[i]->heap);
+		hash_table_free(btr_search_sys->hash_tables[i]);
+
+		rw_lock_free(&btr_search_latch_arr[i]);
 	}
-	mem_free(btr_search_sys->hash_index);
-	mem_free(btr_search_latch_part);
+	mem_free(btr_search_sys->hash_tables);
+	mem_free(btr_search_latch_arr);
 
 	//rw_lock_free(&btr_search_latch);
 	//mem_free(btr_search_latch_temp);
@@ -270,8 +268,8 @@
 
 	/* Clear the adaptive hash index. */
 	for (i = 0; i < btr_search_index_num; i++) {
-		hash_table_clear(btr_search_sys->hash_index[i]);
-		mem_heap_empty(btr_search_sys->hash_index[i]->heap);
+		hash_table_clear(btr_search_sys->hash_tables[i]);
+		mem_heap_empty(btr_search_sys->hash_tables[i]->heap);
 	}
 
 	btr_search_x_unlock_all();
@@ -334,27 +332,27 @@
 
 /*****************************************************************//**
 Returns the value of ref_count. The value is protected by
-btr_search_latch.
+the .
 @return	ref_count value. */
 UNIV_INTERN
 ulint
 btr_search_info_get_ref_count(
 /*==========================*/
 	btr_search_t*   info,	/*!< in: search info. */
-	index_id_t	key)
+	dict_index_t*	index)	/*!< in: index */
 {
 	ulint ret;
 
 	ut_ad(info);
 
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_SHARED));
-	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_EX));
+	ut_ad(!rw_lock_own(btr_search_get_latch(index), RW_LOCK_SHARED));
+	ut_ad(!rw_lock_own(btr_search_get_latch(index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
-	rw_lock_s_lock(btr_search_get_latch(key));
+	rw_lock_s_lock(btr_search_get_latch(index));
 	ret = info->ref_count;
-	rw_lock_s_unlock(btr_search_get_latch(key));
+	rw_lock_s_unlock(btr_search_get_latch(index));
 
 	return(ret);
 }
@@ -375,8 +373,8 @@
 	int		cmp;
 
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_SHARED));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
 	index = cursor->index;
@@ -494,8 +492,8 @@
 				/*!< in: cursor */
 {
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_SHARED));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_EX));
 	ut_ad(rw_lock_own(&block->lock, RW_LOCK_SHARED)
 	      || rw_lock_own(&block->lock, RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
@@ -579,7 +577,7 @@
 
 	ut_ad(cursor->flag == BTR_CUR_HASH_FAIL);
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));
+	ut_ad(rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_EX));
 	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)
 	      || rw_lock_own(&(block->lock), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
@@ -620,11 +618,12 @@
 			mem_heap_free(heap);
 		}
 #ifdef UNIV_SYNC_DEBUG
-		ut_ad(rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));
+		ut_ad(rw_lock_own(btr_search_get_latch(cursor->index),
+				  RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
-		ha_insert_for_fold(btr_search_get_hash_index(cursor->index->id), fold,
-				   block, rec);
+		ha_insert_for_fold(btr_search_get_hash_table(cursor->index),
+				   fold, block, rec);
 	}
 }
 
@@ -643,8 +642,8 @@
 	ulint*		params2;
 
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));
-	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_SHARED));
+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
 	block = btr_cur_get_block(cursor);
@@ -662,7 +661,7 @@
 
 	if (build_index || (cursor->flag == BTR_CUR_HASH_FAIL)) {
 
-		btr_search_check_free_space_in_heap(cursor->index->id);
+		btr_search_check_free_space_in_heap(cursor->index);
 	}
 
 	if (cursor->flag == BTR_CUR_HASH_FAIL) {
@@ -672,11 +671,11 @@
 		btr_search_n_hash_fail++;
 #endif /* UNIV_SEARCH_PERF_STAT */
 
-		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_lock(btr_search_get_latch(cursor->index));
 
 		btr_search_update_hash_ref(info, block, cursor);
 
-		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_unlock(btr_search_get_latch(cursor->index));
 	}
 
 	if (build_index) {
@@ -921,17 +920,17 @@
 	cursor->flag = BTR_CUR_HASH;
 
 	if (UNIV_LIKELY(!has_search_latch)) {
-		rw_lock_s_lock(btr_search_get_latch(index_id));
+		rw_lock_s_lock(btr_search_get_latch(index));
 
 		if (UNIV_UNLIKELY(!btr_search_enabled)) {
 			goto failure_unlock;
 		}
 	}
 
-	ut_ad(rw_lock_get_writer(btr_search_get_latch(index_id)) != RW_LOCK_EX);
-	ut_ad(rw_lock_get_reader_count(btr_search_get_latch(index_id)) > 0);
+	ut_ad(rw_lock_get_writer(btr_search_get_latch(index)) != RW_LOCK_EX);
+	ut_ad(rw_lock_get_reader_count(btr_search_get_latch(index)) > 0);
 
-	rec = ha_search_and_get_data(btr_search_get_hash_index(index_id), fold);
+	rec = ha_search_and_get_data(btr_search_get_hash_table(index), fold);
 
 	if (UNIV_UNLIKELY(!rec)) {
 		goto failure_unlock;
@@ -949,7 +948,7 @@
 			goto failure_unlock;
 		}
 
-		rw_lock_s_unlock(btr_search_get_latch(index_id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 
 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
 	}
@@ -1046,7 +1045,7 @@
 	/*-------------------------------------------*/
 failure_unlock:
 	if (UNIV_LIKELY(!has_search_latch)) {
-		rw_lock_s_unlock(btr_search_get_latch(index_id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 	}
 failure:
 	cursor->flag = BTR_CUR_HASH_FAIL;
@@ -1091,48 +1090,26 @@
 	ulint*			offsets;
 
 retry:
-	if (btr_search_index_num > 1) {
-		rw_lock_t*	btr_search_latch;
-
-		/* FIXME: This may be optimistic implementation still. */
-		btr_search_latch = (rw_lock_t*)(block->btr_search_latch);
-		if (UNIV_LIKELY(!btr_search_latch)) {
-			if (block->index) {
-				goto retry;
-			}
-			return;
-		}
-		rw_lock_s_lock(btr_search_latch);
-		if (UNIV_LIKELY(btr_search_latch != block->btr_search_latch)) {
-			rw_lock_s_unlock(btr_search_latch);
-			goto retry;
-		}
-		if (UNIV_LIKELY(!block->index)) {
-			rw_lock_s_unlock(btr_search_latch);
-			goto retry;
-		}
-		index = block->index;
-		ut_a(btr_search_latch == btr_search_get_latch(index->id));
-	} else {
-		/* btr_search_index_num == 1 */
-		/* btr_search_latch is only one and able to obtain
-		   before evaluating block->index. */
-		rw_lock_s_lock(btr_search_latch_part[0]);
-		if (UNIV_LIKELY(!block->index)) {
-			rw_lock_s_unlock(btr_search_latch_part[0]);
-			return;
-		}
-		index = block->index;
-	}
-
-	if (UNIV_LIKELY(!index)) {
-
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+	/* Do a dirty check on block->index, return if the block is not in the
+	adaptive hash index. This is to avoid acquiring an AHI latch for
+	performance considerations. */
+
+	index = block->index;
+	if (!index) {
 
 		return;
 	}
 
-	table = btr_search_get_hash_index(index->id);
+	rw_lock_s_lock(btr_search_get_latch(index));
+
+	if (UNIV_UNLIKELY(index != block->index)) {
+
+		rw_lock_s_unlock(btr_search_get_latch(index));
+
+		goto retry;
+	}
+
+	table = btr_search_get_hash_table(index);
 
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)
@@ -1149,7 +1126,7 @@
 	releasing btr_search_latch, as the index page might only
 	be s-latched! */
 
-	rw_lock_s_unlock(btr_search_get_latch(index->id));
+	rw_lock_s_unlock(btr_search_get_latch(index));
 
 	ut_a(n_fields + n_bytes > 0);
 
@@ -1200,7 +1177,7 @@
 		mem_heap_free(heap);
 	}
 
-	rw_lock_x_lock(btr_search_get_latch(index->id));
+	rw_lock_x_lock(btr_search_get_latch(index));
 
 	if (UNIV_UNLIKELY(!block->index)) {
 		/* Someone else has meanwhile dropped the hash index */
@@ -1216,7 +1193,7 @@
 		/* Someone else has meanwhile built a new hash index on the
 		page, with different parameters */
 
-		rw_lock_x_unlock(btr_search_get_latch(index->id));
+		rw_lock_x_unlock(btr_search_get_latch(index));
 
 		mem_free(folds);
 		goto retry;
@@ -1231,7 +1208,6 @@
 	index->search_info->ref_count--;
 
 	block->index = NULL;
-	block->btr_search_latch = NULL;
 
 cleanup:
 #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
@@ -1244,14 +1220,14 @@
 			"InnoDB: the hash index to a page of %s,"
 			" still %lu hash nodes remain.\n",
 			index->name, (ulong) block->n_pointers);
-		rw_lock_x_unlock(btr_search_get_latch(index->id));
+		rw_lock_x_unlock(btr_search_get_latch(index));
 
 		ut_ad(btr_search_validate());
 	} else {
-		rw_lock_x_unlock(btr_search_get_latch(index->id));
+		rw_lock_x_unlock(btr_search_get_latch(index));
 	}
 #else /* UNIV_AHI_DEBUG || UNIV_DEBUG */
-	rw_lock_x_unlock(btr_search_get_latch(index->id));
+	rw_lock_x_unlock(btr_search_get_latch(index));
 #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
 
 	mem_free(folds);
@@ -1283,9 +1259,9 @@
 	ulint*		offsets;
 	ibool		released_search_latch;
 
-	rw_lock_s_lock(btr_search_get_latch(index->id));
+	rw_lock_s_lock(btr_search_get_latch(index));
 
-	table = btr_search_get_hash_index(index->id);
+	table = btr_search_get_hash_table(index);
 
 	for (j = 0; j < srv_buf_pool_instances; j++) {
 		buf_pool_t*	buf_pool;
@@ -1319,7 +1295,8 @@
 
 
 					/* keeping latch order */
-					rw_lock_s_unlock(btr_search_get_latch(index->id));
+					rw_lock_s_unlock(
+						btr_search_get_latch(index));
 					released_search_latch = TRUE;
 					rw_lock_x_lock(&block->lock);
 
@@ -1371,7 +1348,8 @@
 						mem_heap_empty(heap);
 					}
 
-					rw_lock_x_lock(btr_search_get_latch(index->id));
+					rw_lock_x_lock(
+						btr_search_get_latch(index));
 
 					if (UNIV_UNLIKELY(!block->index)) {
 						goto cleanup;
@@ -1381,12 +1359,14 @@
 
 					if (UNIV_UNLIKELY(block->curr_n_fields != n_fields)
 					    || UNIV_UNLIKELY(block->curr_n_bytes != n_bytes)) {
-						rw_lock_x_unlock(btr_search_get_latch(index->id));
+						rw_lock_x_unlock(
+							btr_search_get_latch(index));
 						rw_lock_x_unlock(&block->lock);
 
 						mem_free(folds);
 
-						rw_lock_s_lock(btr_search_get_latch(index->id));
+						rw_lock_s_lock(
+							btr_search_get_latch(index));
 						goto retry;
 					}
 
@@ -1399,7 +1379,6 @@
 					index->search_info->ref_count--;
 
 					block->index = NULL;
-					block->btr_search_latch = NULL;
 
 cleanup:
 #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
@@ -1412,18 +1391,20 @@
 							index->name, (ulong) block->n_pointers);
 					}
 #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
-					rw_lock_x_unlock(btr_search_get_latch(index->id));
+					rw_lock_x_unlock(
+						btr_search_get_latch(index));
 					rw_lock_x_unlock(&block->lock);
 
 					mem_free(folds);
 
-					rw_lock_s_lock(btr_search_get_latch(index->id));
+					rw_lock_s_lock(
+						btr_search_get_latch(index));
 				}
 			}
 		} while (released_search_latch);
 	}
 
-	rw_lock_s_unlock(btr_search_get_latch(index->id));
+	rw_lock_s_unlock(btr_search_get_latch(index));
 
 	if (UNIV_LIKELY_NULL(heap)) {
 		mem_heap_free(heap);
@@ -1502,7 +1483,7 @@
 	ut_ad(index);
 	ut_a(!dict_index_is_ibuf(index));
 
-	table = btr_search_get_hash_index(index->id);
+	table = btr_search_get_hash_table(index);
 	page = buf_block_get_frame(block);
 
 #ifdef UNIV_SYNC_DEBUG
@@ -1511,17 +1492,17 @@
 	      || rw_lock_own(&(block->lock), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
-	rw_lock_s_lock(btr_search_get_latch(index->id));
+	rw_lock_s_lock(btr_search_get_latch(index));
 
 	if (block->index && ((block->curr_n_fields != n_fields)
 				 || (block->curr_n_bytes != n_bytes)
 				 || (block->curr_left_side != left_side))) {
 
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 
 		btr_search_drop_page_hash_index(block);
 	} else {
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 	}
 
 	n_recs = page_get_n_recs(page);
@@ -1615,9 +1596,9 @@
 		fold = next_fold;
 	}
 
-	btr_search_check_free_space_in_heap(index->id);
+	btr_search_check_free_space_in_heap(index);
 
-	rw_lock_x_lock(btr_search_get_latch(index->id));
+	rw_lock_x_lock(btr_search_get_latch(index));
 
 	if (UNIV_UNLIKELY(!btr_search_enabled)) {
 		goto exit_func;
@@ -1644,7 +1625,6 @@
 	block->curr_n_bytes = n_bytes;
 	block->curr_left_side = left_side;
 	block->index = index;
-	block->btr_search_latch = btr_search_get_latch(index->id);
 
 	for (i = 0; i < n_cached; i++) {
 
@@ -1652,7 +1632,7 @@
 	}
 
 exit_func:
-	rw_lock_x_unlock(btr_search_get_latch(index->id));
+	rw_lock_x_unlock(btr_search_get_latch(index));
 
 	mem_free(folds);
 	mem_free(recs);
@@ -1687,7 +1667,7 @@
 	ut_ad(rw_lock_own(&(new_block->lock), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 
-	rw_lock_s_lock(btr_search_get_latch(index->id));
+	rw_lock_s_lock(btr_search_get_latch(index));
 
 	ut_a(!new_block->index || new_block->index == index);
 	ut_a(!block->index || block->index == index);
@@ -1696,7 +1676,7 @@
 
 	if (new_block->index) {
 
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 
 		btr_search_drop_page_hash_index(block);
 
@@ -1713,7 +1693,7 @@
 		new_block->n_bytes = block->curr_n_bytes;
 		new_block->left_side = left_side;
 
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 
 		ut_a(n_fields + n_bytes > 0);
 
@@ -1725,7 +1705,7 @@
 		return;
 	}
 
-	rw_lock_s_unlock(btr_search_get_latch(index->id));
+	rw_lock_s_unlock(btr_search_get_latch(index));
 }
 
 /********************************************************************//**
@@ -1764,7 +1744,7 @@
 	ut_a(block->curr_n_fields + block->curr_n_bytes > 0);
 	ut_a(!dict_index_is_ibuf(index));
 
-	table = btr_search_get_hash_index(cursor->index->id);
+	table = btr_search_get_hash_table(cursor->index);
 
 	rec = btr_cur_get_rec(cursor);
 
@@ -1775,7 +1755,7 @@
 		mem_heap_free(heap);
 	}
 
-	rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
+	rw_lock_x_lock(btr_search_get_latch(cursor->index));
 
 	if (block->index) {
 		ut_a(block->index == index);
@@ -1783,7 +1763,7 @@
 		ha_search_and_delete_if_found(table, fold, rec);
 	}
 
-	rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
+	rw_lock_x_unlock(btr_search_get_latch(cursor->index));
 }
 
 /********************************************************************//**
@@ -1820,7 +1800,7 @@
 	ut_a(cursor->index == index);
 	ut_a(!dict_index_is_ibuf(index));
 
-	rw_lock_x_lock(btr_search_get_latch(cursor->index->id));
+	rw_lock_x_lock(btr_search_get_latch(cursor->index));
 
 	if (!block->index) {
 
@@ -1834,15 +1814,15 @@
 	    && (cursor->n_bytes == block->curr_n_bytes)
 	    && !block->curr_left_side) {
 
-		table = btr_search_get_hash_index(cursor->index->id);
+		table = btr_search_get_hash_table(cursor->index);
 
 		ha_search_and_update_if_found(table, cursor->fold, rec,
 					      block, page_rec_get_next(rec));
 
 func_exit:
-		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_unlock(btr_search_get_latch(cursor->index));
 	} else {
-		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));
+		rw_lock_x_unlock(btr_search_get_latch(cursor->index));
 
 		btr_search_update_hash_on_insert(cursor);
 	}
@@ -1877,9 +1857,9 @@
 	ulint*		offsets		= offsets_;
 	rec_offs_init(offsets_);
 
-	table = btr_search_get_hash_index(cursor->index->id);
+	table = btr_search_get_hash_table(cursor->index);
 
-	btr_search_check_free_space_in_heap(cursor->index->id);
+	btr_search_check_free_space_in_heap(cursor->index);
 
 	rec = btr_cur_get_rec(cursor);
 
@@ -1924,7 +1904,7 @@
 	} else {
 		if (left_side) {
 
-			rw_lock_x_lock(btr_search_get_latch(index->id));
+			rw_lock_x_lock(btr_search_get_latch(index));
 
 			locked = TRUE;
 
@@ -1942,7 +1922,7 @@
 
 		if (!locked) {
 
-			rw_lock_x_lock(btr_search_get_latch(index->id));
+			rw_lock_x_lock(btr_search_get_latch(index));
 
 			locked = TRUE;
 
@@ -1964,7 +1944,7 @@
 		if (!left_side) {
 
 			if (!locked) {
-				rw_lock_x_lock(btr_search_get_latch(index->id));
+				rw_lock_x_lock(btr_search_get_latch(index));
 
 				locked = TRUE;
 
@@ -1983,7 +1963,7 @@
 
 		if (!locked) {
 
-			rw_lock_x_lock(btr_search_get_latch(index->id));
+			rw_lock_x_lock(btr_search_get_latch(index));
 
 			locked = TRUE;
 
@@ -2010,7 +1990,7 @@
 		mem_heap_free(heap);
 	}
 	if (locked) {
-		rw_lock_x_unlock(btr_search_get_latch(index->id));
+		rw_lock_x_unlock(btr_search_get_latch(index));
 	}
 }
 
@@ -2043,7 +2023,7 @@
 
 	for (j = 0; j < btr_search_index_num; j++) {
 
-	cell_count = hash_get_n_cells(btr_search_sys->hash_index[j]);
+	cell_count = hash_get_n_cells(btr_search_sys->hash_tables[j]);
 
 	for (i = 0; i < cell_count; i++) {
 		/* We release btr_search_latch every once in a while to
@@ -2056,7 +2036,7 @@
 			buf_pool_page_hash_x_lock_all();
 		}
 
-		node = hash_get_nth_cell(btr_search_sys->hash_index[j], i)->node;
+		node = hash_get_nth_cell(btr_search_sys->hash_tables[j], i)->node;
 
 		for (; node != NULL; node = node->next) {
 			const buf_block_t*	block
@@ -2171,7 +2151,7 @@
 			buf_pool_page_hash_x_lock_all();
 		}
 
-		if (!ha_validate(btr_search_sys->hash_index[j], i, end_index)) {
+		if (!ha_validate(btr_search_sys->hash_tables[j], i, end_index)) {
 			ok = FALSE;
 		}
 	}

=== modified file 'Percona-Server/storage/innobase/buf/buf0buf.c'
--- Percona-Server/storage/innobase/buf/buf0buf.c	2013-08-16 13:17:34 +0000
+++ Percona-Server/storage/innobase/buf/buf0buf.c	2013-09-02 14:07:43 +0000
@@ -989,7 +989,6 @@
 
 	block->check_index_page_at_flush = FALSE;
 	block->index = NULL;
-	block->btr_search_latch = NULL;
 
 #ifdef UNIV_DEBUG
 	block->page.in_page_hash = FALSE;
@@ -1468,7 +1467,7 @@
 	ulint	j;
 
 	for (j = 0; j < btr_search_index_num; j++) {
-		ut_ad(rw_lock_own(btr_search_latch_part[j], RW_LOCK_EX));
+		ut_ad(rw_lock_own(&btr_search_latch_arr[j], RW_LOCK_EX));
 	}
 #endif /* UNIV_SYNC_DEBUG */
 	ut_ad(!btr_search_enabled);
@@ -2147,7 +2146,6 @@
 {
 	block->check_index_page_at_flush = FALSE;
 	block->index		= NULL;
-	block->btr_search_latch	= NULL;
 
 	block->n_hash_helps	= 0;
 	block->n_fields		= 1;

=== modified file 'Percona-Server/storage/innobase/dict/dict0boot.c'
--- Percona-Server/storage/innobase/dict/dict0boot.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/dict/dict0boot.c	2013-09-02 14:07:43 +0000
@@ -31,6 +31,7 @@
 
 #include "dict0crea.h"
 #include "btr0btr.h"
+#include "btr0sea.h"
 #include "dict0load.h"
 #include "dict0load.h"
 #include "trx0trx.h"
@@ -346,6 +347,7 @@
 	dict_mem_index_add_field(index, "KEY_COLS", 0);
 
 	index->id = DICT_STATS_ID;
+	btr_search_index_init(index);
 
 	root_page_id = mtr_read_ulint(dict_hdr + DICT_HDR_STATS, MLOG_4BYTES,
 				      mtr);
@@ -481,6 +483,7 @@
 	dict_mem_index_add_field(index, "NAME", 0);
 
 	index->id = DICT_TABLES_ID;
+	btr_search_index_init(index);
 
 	error = dict_index_add_to_cache(table, index,
 					mtr_read_ulint(dict_hdr
@@ -495,6 +498,8 @@
 	dict_mem_index_add_field(index, "ID", 0);
 
 	index->id = DICT_TABLE_IDS_ID;
+	btr_search_index_init(index);
+
 	error = dict_index_add_to_cache(table, index,
 					mtr_read_ulint(dict_hdr
 						       + DICT_HDR_TABLE_IDS,
@@ -528,6 +533,7 @@
 	dict_mem_index_add_field(index, "POS", 0);
 
 	index->id = DICT_COLUMNS_ID;
+	btr_search_index_init(index);
 	error = dict_index_add_to_cache(table, index,
 					mtr_read_ulint(dict_hdr
 						       + DICT_HDR_COLUMNS,
@@ -574,6 +580,7 @@
 	dict_mem_index_add_field(index, "ID", 0);
 
 	index->id = DICT_INDEXES_ID;
+	btr_search_index_init(index);
 	error = dict_index_add_to_cache(table, index,
 					mtr_read_ulint(dict_hdr
 						       + DICT_HDR_INDEXES,
@@ -602,6 +609,7 @@
 	dict_mem_index_add_field(index, "POS", 0);
 
 	index->id = DICT_FIELDS_ID;
+	btr_search_index_init(index);
 	error = dict_index_add_to_cache(table, index,
 					mtr_read_ulint(dict_hdr
 						       + DICT_HDR_FIELDS,

=== modified file 'Percona-Server/storage/innobase/dict/dict0dict.c'
--- Percona-Server/storage/innobase/dict/dict0dict.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/dict/dict0dict.c	2013-09-02 14:07:43 +0000
@@ -1972,7 +1972,7 @@
 	zero. */
 
 	for (;;) {
-		ulint ref_count = btr_search_info_get_ref_count(info, index->id);
+		ulint ref_count = btr_search_info_get_ref_count(info, index);
 		if (ref_count == 0) {
 			break;
 		}
@@ -2224,6 +2224,7 @@
 	new_index->n_user_defined_cols = index->n_fields;
 
 	new_index->id = index->id;
+	btr_search_index_init(new_index);
 
 	/* Copy the fields of index */
 	dict_index_copy(new_index, index, table, 0, index->n_fields);
@@ -2394,6 +2395,7 @@
 	new_index->n_user_defined_cols = index->n_fields;
 
 	new_index->id = index->id;
+	btr_search_index_init(new_index);
 
 	/* Copy fields from index to new_index */
 	dict_index_copy(new_index, index, table, 0, index->n_fields);

=== modified file 'Percona-Server/storage/innobase/dict/dict0load.c'
--- Percona-Server/storage/innobase/dict/dict0load.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/dict/dict0load.c	2013-09-02 14:07:43 +0000
@@ -33,6 +33,7 @@
 
 #include "btr0pcur.h"
 #include "btr0btr.h"
+#include "btr0sea.h"
 #include "page0page.h"
 #include "mach0data.h"
 #include "dict0dict.h"
@@ -1432,6 +1433,7 @@
 
 	(*index)->id = id;
 	(*index)->page = mach_read_from_4(field);
+	btr_search_index_init(*index);
 	ut_ad((*index)->page);
 
 	return(NULL);

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-08-23 07:35:34 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-02 14:07:43 +0000
@@ -963,9 +963,14 @@
 /*==============================*/
 	trx_t*	trx)	/*!< in: transaction handle */
 {
+<<<<<<< TREE
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
+=======
+	/* No-op in XtraDB */
+	trx_search_latch_release_if_reserved(trx);
+>>>>>>> MERGE-SOURCE
 
 	if (trx->declared_to_be_inside_innodb) {
 
@@ -3564,9 +3569,8 @@
 	/* Since we will reserve the kernel mutex, we have to release
 	the search system latch first to obey the latching order. */
 
-	if (trx->has_search_latch) {
-		trx_search_latch_release_if_reserved(trx);
-	}
+	/* No-op in XtraDB */
+	trx_search_latch_release_if_reserved(trx);
 
 	if (!trx_is_registered_for_2pc(trx) && trx_is_started(trx)) {
 		/* We cannot throw error here; instead we will catch this error
@@ -3612,9 +3616,8 @@
 	/* Since we will reserve the kernel mutex, we have to release
 	the search system latch first to obey the latching order. */
 
-	if (trx->has_search_latch) {
-		trx_search_latch_release_if_reserved(trx);
-	}
+	/* No-op in XtraDB */
+	trx_search_latch_release_if_reserved(trx);
 
 	if (trx->fake_changes && (all || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) {
 		innobase_rollback(hton, thd, all); /* rollback implicitly */
@@ -12820,6 +12823,8 @@
   "Disable with --skip-innodb-adaptive-hash-index.",
   NULL, innodb_adaptive_hash_index_update, TRUE);
 
+/* btr_search_index_num is constrained to machine word size for historical
+reasons. This limitation can be easily removed later. */
 static MYSQL_SYSVAR_ULONG(adaptive_hash_index_partitions, btr_search_index_num,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)",

=== modified file 'Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c'
--- Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c	2013-09-02 14:07:43 +0000
@@ -48,6 +48,7 @@
 #include "btr0cur.h"
 #include "btr0pcur.h"
 #include "btr0btr.h"
+#include "btr0sea.h"
 #include "row0upd.h"
 #include "sync0sync.h"
 #include "dict0boot.h"
@@ -631,6 +632,7 @@
 	dict_mem_index_add_field(index, "DUMMY_COLUMN", 0);
 
 	index->id = DICT_IBUF_ID_MIN + IBUF_SPACE_ID;
+	btr_search_index_init(index);
 
 	error = dict_index_add_to_cache(table, index,
 					FSP_IBUF_TREE_ROOT_PAGE_NO, FALSE);

=== modified file 'Percona-Server/storage/innobase/include/btr0sea.h'
--- Percona-Server/storage/innobase/include/btr0sea.h	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/include/btr0sea.h	2013-09-02 14:07:43 +0000
@@ -86,7 +86,7 @@
 btr_search_info_get_ref_count(
 /*==========================*/
 	btr_search_t*   info,	/*!< in: search info. */
-	index_id_t	key);
+	dict_index_t*	index); /*!< in: index */
 /*********************************************************************//**
 Updates the search info. */
 UNIV_INLINE
@@ -204,15 +204,35 @@
 New functions to control split btr_search_index */
 UNIV_INLINE
 hash_table_t*
-btr_search_get_hash_index(
+btr_search_get_hash_table(
 /*======================*/
-	index_id_t	key);
+	const dict_index_t*	index)	/*!< in: index */
+	__attribute__((nonnull,pure,warn_unused_result));
 
 UNIV_INLINE
 rw_lock_t*
 btr_search_get_latch(
 /*=================*/
-	index_id_t	key);
+	const dict_index_t*	index)	/*!< in: index */
+	__attribute__((nonnull,pure,warn_unused_result));
+
+/*********************************************************************//**
+Returns the AHI partition number corresponding to a give index ID. */
+UNIV_INLINE
+ulint
+btr_search_get_key(
+/*===============*/
+	index_id_t	index_id)	/*!< in: index ID */
+	__attribute__((pure,warn_unused_result));
+
+/*********************************************************************//**
+Initializes AHI-related fields in a newly created index. */
+UNIV_INLINE
+void
+btr_search_index_init(
+/*===============*/
+	dict_index_t*	index)	/*!< in: index */
+	__attribute__((nonnull));
 
 UNIV_INLINE
 void
@@ -224,15 +244,16 @@
 btr_search_x_unlock_all(void);
 /*==========================*/
 
-UNIV_INLINE
-void
-btr_search_s_lock_all(void);
-/*========================*/
-
-UNIV_INLINE
-void
-btr_search_s_unlock_all(void);
-/*==========================*/
+#ifdef UNIV_SYNC_DEBUG
+/********************************************************************//**
+Checks if the thread owns any adaptive hash latches in either S or X mode.
+@return	TRUE if the thread owns at least one latch in any mode. */
+UNIV_INLINE
+ibool
+btr_search_own_any(void)
+/*=====================*/
+	 __attribute__((warn_unused_result));
+#endif
 
 /** The search info struct in an index */
 struct btr_search_struct{
@@ -294,8 +315,8 @@
 
 /** The hash index system */
 struct btr_search_sys_struct{
-	hash_table_t**	hash_index;	/*!< the adaptive hash index,
-					mapping dtuple_fold values
+	hash_table_t**	hash_tables;	/*!< the array of adaptive hash index,
+					tables mapping dtuple_fold values
 					to rec_t pointers on index pages */
 };
 

=== modified file 'Percona-Server/storage/innobase/include/btr0sea.ic'
--- Percona-Server/storage/innobase/include/btr0sea.ic	2013-08-02 09:40:55 +0000
+++ Percona-Server/storage/innobase/include/btr0sea.ic	2013-09-02 14:07:43 +0000
@@ -87,20 +87,55 @@
 New functions to control split btr_search_index */
 UNIV_INLINE
 hash_table_t*
-btr_search_get_hash_index(
+btr_search_get_hash_table(
 /*======================*/
-	index_id_t	key)
+	const dict_index_t*	index)	/*!< in: index */
 {
-	return(btr_search_sys->hash_index[key % btr_search_index_num]);
+	ut_ad(index);
+	ut_ad(index->search_table);
+
+	return(index->search_table);
 }
 
 UNIV_INLINE
 rw_lock_t*
 btr_search_get_latch(
 /*=================*/
-	index_id_t	key)
-{
-	return(btr_search_latch_part[key % btr_search_index_num]);
+	const dict_index_t*	index)	/*!< in: index */
+{
+	ut_ad(index);
+	ut_ad(index->search_latch >= btr_search_latch_arr &&
+	      index->search_latch < btr_search_latch_arr +
+	      btr_search_index_num);
+
+	return(index->search_latch);
+}
+
+/*********************************************************************//**
+Returns the AHI partition number corresponding to a give index ID. */
+UNIV_INLINE
+ulint
+btr_search_get_key(
+/*===============*/
+	index_id_t	index_id)	/*!< in: index ID */
+{
+	return(index_id % btr_search_index_num);
+}
+
+/*********************************************************************//**
+Initializes AHI-related fields in a newly created index. */
+UNIV_INLINE
+void
+btr_search_index_init(
+/*===============*/
+	dict_index_t*	index)	/*!< in: index */
+{
+	ut_ad(index);
+
+	index->search_latch =
+		&btr_search_latch_arr[btr_search_get_key(index->id)];
+	index->search_table =
+		btr_search_sys->hash_tables[btr_search_get_key(index->id)];
 }
 
 UNIV_INLINE
@@ -111,7 +146,7 @@
 	ulint	i;
 
 	for (i = 0; i < btr_search_index_num; i++) {
-		rw_lock_x_lock(btr_search_latch_part[i]);
+		rw_lock_x_lock(&btr_search_latch_arr[i]);
 	}
 }
 
@@ -123,31 +158,28 @@
 	ulint	i;
 
 	for (i = 0; i < btr_search_index_num; i++) {
-		rw_lock_x_unlock(btr_search_latch_part[i]);
-	}
-}
-
-UNIV_INLINE
-void
-btr_search_s_lock_all(void)
-/*=======================*/
-{
-	ulint	i;
-
-	for (i = 0; i < btr_search_index_num; i++) {
-		rw_lock_s_lock(btr_search_latch_part[i]);
-	}
-}
-
-UNIV_INLINE
-void
-btr_search_s_unlock_all(void)
-/*=========================*/
-{
-	ulint	i;
-
-	for (i = 0; i < btr_search_index_num; i++) {
-		rw_lock_s_unlock(btr_search_latch_part[i]);
-	}
-}
-
+		rw_lock_x_unlock(&btr_search_latch_arr[i]);
+	}
+}
+
+#ifdef UNIV_SYNC_DEBUG
+/********************************************************************//**
+Checks if the thread owns any adaptive hash latches in either S or X mode.
+@return	TRUE if the thread owns at least one latch in any mode. */
+UNIV_INLINE
+ibool
+btr_search_own_any(void)
+/*====================*/
+{
+	ulint	i;
+
+	for (i = 0; i < btr_search_index_num; i++) {
+		if (rw_lock_own(&btr_search_latch_arr[i], RW_LOCK_SHARED) ||
+		    rw_lock_own(&btr_search_latch_arr[i], RW_LOCK_EX)) {
+			return(TRUE);
+		}
+	}
+
+	return(FALSE);
+}
+#endif

=== modified file 'Percona-Server/storage/innobase/include/btr0types.h'
--- Percona-Server/storage/innobase/include/btr0types.h	2013-08-02 09:40:55 +0000
+++ Percona-Server/storage/innobase/include/btr0types.h	2013-09-02 14:07:43 +0000
@@ -41,22 +41,21 @@
 
 #ifndef UNIV_HOTBACKUP
 
-/** @brief The latch protecting the adaptive search system
+/** @brief The array of latches protecting the adaptive search partitions
 
-This latch protects the
-(1) hash index;
+These latch protect the
+(1) hash index from the corresponding AHI partition;
 (2) columns of a record to which we have a pointer in the hash index;
 
-but does NOT protect:
+but do NOT protect:
 
 (3) next record offset field in a record;
 (4) next or previous records on the same page.
 
-Bear in mind (3) and (4) when using the hash index.
+Bear in mind (3) and (4) when using the hash indexes.
 */
-//extern rw_lock_t*	btr_search_latch_temp;
 
-extern rw_lock_t**	btr_search_latch_part;
+extern rw_lock_t*	btr_search_latch_arr;
 
 #endif /* UNIV_HOTBACKUP */
 

=== modified file 'Percona-Server/storage/innobase/include/buf0buf.h'
--- Percona-Server/storage/innobase/include/buf0buf.h	2013-08-16 08:58:49 +0000
+++ Percona-Server/storage/innobase/include/buf0buf.h	2013-09-02 14:07:43 +0000
@@ -1714,7 +1714,6 @@
 					complete, though: there may
 					have been hash collisions,
 					record deletions, etc. */
-	volatile rw_lock_t*     btr_search_latch;
 	/* @} */
 # ifdef UNIV_SYNC_DEBUG
 	/** @name Debug fields */

=== modified file 'Percona-Server/storage/innobase/include/dict0mem.h'
--- Percona-Server/storage/innobase/include/dict0mem.h	2013-06-27 15:35:20 +0000
+++ Percona-Server/storage/innobase/include/dict0mem.h	2013-09-02 14:07:43 +0000
@@ -365,6 +365,10 @@
 initialized to 0, NULL or FALSE in dict_mem_index_create(). */
 struct dict_index_struct{
 	index_id_t	id;	/*!< id of the index */
+	rw_lock_t*	search_latch; /*!< latch protecting the AHI partition
+				      corresponding to this index */
+	hash_table_t*	search_table; /*!< hash table protected by
+				      search_latch */
 	mem_heap_t*	heap;	/*!< memory heap */
 	const char*	name;	/*!< index name */
 	const char*	table_name;/*!< table name */

=== modified file 'Percona-Server/storage/innobase/include/trx0trx.h'
--- Percona-Server/storage/innobase/include/trx0trx.h	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/include/trx0trx.h	2013-09-02 14:07:43 +0000
@@ -49,12 +49,14 @@
 extern ulint	trx_n_prepared;
 
 /********************************************************************//**
-Releases the search latch if trx has reserved it. */
-UNIV_INTERN
+In XtraDB it is impossible for a transaction to own a search latch outside of
+InnoDB code, so there is nothing to release on demand.  We keep this function to
+simplify maintenance.*/
+UNIV_INLINE
 void
 trx_search_latch_release_if_reserved(
 /*=================================*/
-	trx_t*	   trx); /*!< in: transaction */
+	trx_t*	   trx __attribute__((unused))); /*!< in: transaction */
 /******************************************************************//**
 Set detailed error message for the transaction. */
 UNIV_INTERN
@@ -555,8 +557,8 @@
 					in that case we must flush the log
 					in trx_commit_complete_for_mysql() */
 	ulint		duplicates;	/*!< TRX_DUP_IGNORE | TRX_DUP_REPLACE */
-	ulint		has_search_latch;
-					/* TRUE if this trx has latched the
+	ibool		has_search_latch;
+					/* TRUE if this trx has latched any
 					search system latch in S-mode */
 	ulint		deadlock_mark;	/*!< a mark field used in deadlock
 					checking algorithm.  */

=== modified file 'Percona-Server/storage/innobase/include/trx0trx.ic'
--- Percona-Server/storage/innobase/include/trx0trx.ic	2013-08-02 09:40:55 +0000
+++ Percona-Server/storage/innobase/include/trx0trx.ic	2013-09-02 14:07:43 +0000
@@ -23,6 +23,19 @@
 Created 3/26/1996 Heikki Tuuri
 *******************************************************/
 
+/********************************************************************//**
+In XtraDB it is impossible for a transaction to own a search latch outside of
+InnoDB code, so there is nothing to release on demand.  We keep this function to
+simplify maintenance.*/
+UNIV_INLINE
+void
+trx_search_latch_release_if_reserved(
+/*=================================*/
+	trx_t*	   trx __attribute__((unused))) /*!< in: transaction */
+{
+	ut_ad(!trx->has_search_latch);
+}
+
 /*************************************************************//**
 Starts the transaction if it is not yet started. */
 UNIV_INLINE

=== modified file 'Percona-Server/storage/innobase/row/row0mysql.c'
--- Percona-Server/storage/innobase/row/row0mysql.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/row/row0mysql.c	2013-09-02 14:07:43 +0000
@@ -2664,7 +2664,9 @@
 			/* check adaptive hash entries */
 			index = dict_table_get_first_index(table);
 			while (index) {
-				ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id);
+				ulint ref_count =
+					btr_search_info_get_ref_count(
+						index->search_info, index);
 				if (ref_count) {
 					fprintf(stderr, "InnoDB: Warning:"
 						" hash index ref_count (%lu) is not zero"
@@ -3025,7 +3027,9 @@
 			table->space = space;
 			index = dict_table_get_first_index(table);
 			do {
-				ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id);
+				ulint ref_count =
+					btr_search_info_get_ref_count(
+						index->search_info, index);
 				/* check adaptive hash entries */
 				if (ref_count) {
 					fprintf(stderr, "InnoDB: Warning:"

=== modified file 'Percona-Server/storage/innobase/row/row0sel.c'
--- Percona-Server/storage/innobase/row/row0sel.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/row/row0sel.c	2013-09-02 14:07:43 +0000
@@ -1224,7 +1224,7 @@
 	ut_ad(plan->unique_search);
 	ut_ad(!plan->must_get_clust);
 #ifdef UNIV_SYNC_DEBUG
-	ut_ad(rw_lock_own(btr_search_get_latch(index->id), RW_LOCK_SHARED));
+	ut_ad(rw_lock_own(btr_search_get_latch(index), RW_LOCK_SHARED));
 #endif /* UNIV_SYNC_DEBUG */
 
 	row_sel_open_pcur(plan, TRUE, mtr);
@@ -1395,10 +1395,11 @@
 	    && !plan->must_get_clust
 	    && !plan->table->big_rows) {
 		if (!search_latch_locked) {
-			rw_lock_s_lock(btr_search_get_latch(index->id));
+			rw_lock_s_lock(btr_search_get_latch(index));
 
 			search_latch_locked = TRUE;
-		} else if (rw_lock_get_writer(btr_search_get_latch(index->id)) == RW_LOCK_WAIT_EX) {
+		} else if (rw_lock_get_writer(btr_search_get_latch(index))
+			   == RW_LOCK_WAIT_EX) {
 
 			/* There is an x-latch request waiting: release the
 			s-latch for a moment; as an s-latch here is often
@@ -1407,8 +1408,8 @@
 			from acquiring an s-latch for a long time, lowering
 			performance significantly in multiprocessors. */
 
-			rw_lock_s_unlock(btr_search_get_latch(index->id));
-			rw_lock_s_lock(btr_search_get_latch(index->id));
+			rw_lock_s_unlock(btr_search_get_latch(index));
+			rw_lock_s_lock(btr_search_get_latch(index));
 		}
 
 		found_flag = row_sel_try_search_shortcut(node, plan, &mtr);
@@ -1431,7 +1432,7 @@
 	}
 
 	if (search_latch_locked) {
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 
 		search_latch_locked = FALSE;
 	}
@@ -2007,7 +2008,7 @@
 
 func_exit:
 	if (search_latch_locked) {
-		rw_lock_s_unlock(btr_search_get_latch(index->id));
+		rw_lock_s_unlock(btr_search_get_latch(index));
 	}
 	if (UNIV_LIKELY_NULL(heap)) {
 		mem_heap_free(heap);
@@ -2744,6 +2745,9 @@
 			heap */
 
 			ut_a(!prebuilt->trx->has_search_latch);
+#ifdef UNIV_SYNC_DEBUG
+			ut_ad(!btr_search_own_any());
+#endif
 
 			if (UNIV_UNLIKELY(templ->type == DATA_BLOB)) {
 				if (prebuilt->blob_heap == NULL) {
@@ -3320,6 +3324,8 @@
 	ut_ad(!prebuilt->templ_contains_blob);
 
 #ifndef UNIV_SEARCH_DEBUG
+	ut_ad(trx->has_search_latch);
+
 	btr_pcur_open_with_no_init(index, search_tuple, PAGE_CUR_GE,
 				   BTR_SEARCH_LEAF, pcur,
 				   RW_S_LATCH,
@@ -3420,8 +3426,6 @@
 	/* if the returned record was locked and we did a semi-consistent
 	read (fetch the newest committed version), then this is set to
 	TRUE */
-	ulint		i;
-	ulint		should_release;
 #ifdef UNIV_SEARCH_DEBUG
 	ulint		cnt				= 0;
 #endif /* UNIV_SEARCH_DEBUG */
@@ -3438,6 +3442,12 @@
 
 	ut_ad(index && pcur && search_tuple);
 
+	ut_ad(!trx->has_search_latch);
+#ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
+	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
+#endif /* UNIV_SYNC_DEBUG */
+
 	if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) {
 		ut_print_timestamp(stderr);
 		fprintf(stderr, "  InnoDB: Error:\n"
@@ -3453,24 +3463,15 @@
 			"InnoDB: how you can resolve the problem.\n",
 			prebuilt->table->name);
 
-#ifdef UNIV_SYNC_DEBUG
-		ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
-#endif /* UNIV_SYNC_DEBUG */
 		return(DB_ERROR);
 	}
 
 	if (UNIV_UNLIKELY(!prebuilt->index_usable)) {
 
-#ifdef UNIV_SYNC_DEBUG
-		ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
-#endif /* UNIV_SYNC_DEBUG */
 		return(DB_MISSING_HISTORY);
 	}
 
 	if (dict_index_is_corrupted(index)) {
-#ifdef UNIV_SYNC_DEBUG
-		ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
-#endif /* UNIV_SYNC_DEBUG */
 		return(DB_CORRUPTION);
 	}
 
@@ -3515,38 +3516,6 @@
 	fprintf(stderr, "N tables locked %lu\n",
 		(ulong) trx->mysql_n_tables_locked);
 #endif
-	/*-------------------------------------------------------------*/
-	/* PHASE 0: Release a possible s-latch we are holding on the
-	adaptive hash index latch if there is someone waiting behind */
-
-	should_release = 0;
-	for (i = 0; i < btr_search_index_num; i++) {
-		/* we should check all latches (fix Bug#791030) */
-		if (UNIV_UNLIKELY(rw_lock_get_writer(btr_search_latch_part[i])
-				  != RW_LOCK_NOT_LOCKED)) {
-			should_release |= ((ulint)1 << i);
-		}
-	}
-
-	if (UNIV_UNLIKELY(should_release)) {
-
-		/* There is an x-latch request on the adaptive hash index:
-		release the s-latch to reduce starvation and wait for
-		BTR_SEA_TIMEOUT rounds before trying to keep it again over
-		calls from MySQL */
-
-		for (i = 0; i < btr_search_index_num; i++) {
-			/* we should release all s-latches (fix Bug#791030) */
-			if (trx->has_search_latch & ((ulint)1 << i)) {
-				rw_lock_s_unlock(btr_search_latch_part[i]);
-				trx->has_search_latch &= (~((ulint)1 << i));
-			}
-		}
-
-		if (!trx->has_search_latch) {
-		trx->search_latch_timeout = BTR_SEA_TIMEOUT;
-		}
-	}
 
 	/* Reset the new record lock info if srv_locks_unsafe_for_binlog
 	is set or session is using a READ COMMITED isolation level. Then
@@ -3696,29 +3665,9 @@
 			hash index semaphore! */
 
 #ifndef UNIV_SEARCH_DEBUG
-			if (!(trx->has_search_latch
-			      & ((ulint)1 << (index->id % btr_search_index_num)))) {
-				if (trx->has_search_latch
-				    < ((ulint)1 << (index->id % btr_search_index_num))) {
-					rw_lock_s_lock(btr_search_get_latch(index->id));
-					trx->has_search_latch |=
-						((ulint)1 << (index->id % btr_search_index_num));
-				} else {
-					/* should re-lock to obay latch-order */
-					for (i = 0; i < btr_search_index_num; i++) {
-						if (trx->has_search_latch & ((ulint)1 << i)) {
-							rw_lock_s_unlock(btr_search_latch_part[i]);
-						}
-					}
-					trx->has_search_latch |=
-						((ulint)1 << (index->id % btr_search_index_num));
-					for (i = 0; i < btr_search_index_num; i++) {
-						if (trx->has_search_latch & ((ulint)1 << i)) {
-							rw_lock_s_lock(btr_search_latch_part[i]);
-						}
-					}
-				}
-			}
+			ut_ad(!trx->has_search_latch);
+			rw_lock_s_lock(btr_search_get_latch(index));
+			trx->has_search_latch = TRUE;
 #endif
 			switch (row_sel_try_search_shortcut_for_mysql(
 					&rec, prebuilt, &offsets, &heap,
@@ -3763,7 +3712,7 @@
 				srv_n_rows_read++;
 
 				err = DB_SUCCESS;
-				goto release_search_latch_if_needed;
+				goto release_search_latch;
 
 			case SEL_EXHAUSTED:
 				mtr_commit(&mtr);
@@ -3772,19 +3721,10 @@
 				fputs(" record not found 2\n", stderr); */
 
 				err = DB_RECORD_NOT_FOUND;
-release_search_latch_if_needed:
-				if (trx->search_latch_timeout > 0
-				    && trx->has_search_latch) {
-
-					trx->search_latch_timeout--;
-
-					for (i = 0; i < btr_search_index_num; i++) {
-						if (trx->has_search_latch & ((ulint)1 << i)) {
-							rw_lock_s_unlock(btr_search_latch_part[i]);
-						}
-					}
-					trx->has_search_latch = FALSE;
-				}
+release_search_latch:
+				rw_lock_s_unlock(
+					btr_search_get_latch(index));
+				trx->has_search_latch = FALSE;
 
 				/* NOTE that we do NOT store the cursor
 				position */
@@ -3799,22 +3739,19 @@
 
 			mtr_commit(&mtr);
 			mtr_start(&mtr);
+
+			rw_lock_s_unlock(btr_search_get_latch(index));
+			trx->has_search_latch = FALSE;
 		}
 	}
 
 	/*-------------------------------------------------------------*/
 	/* PHASE 3: Open or restore index cursor position */
 
-	if (trx->has_search_latch) {
-
-		for (i = 0; i < btr_search_index_num; i++) {
-			if (trx->has_search_latch & ((ulint)1 << i)) {
-				rw_lock_s_unlock(btr_search_latch_part[i]);
-			}
-		}
-		trx->has_search_latch = FALSE;
-	}
-
+	ut_ad(!trx->has_search_latch);
+#ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
+#endif
 	ut_ad(prebuilt->sql_stat_start || trx->state == TRX_ACTIVE);
 	ut_ad(trx->state == TRX_NOT_STARTED
 	      || trx->state == TRX_ACTIVE);
@@ -4851,7 +4788,9 @@
 		}
 	}
 
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 	return(err);

=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.c'
--- Percona-Server/storage/innobase/srv/srv0srv.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.c	2013-09-02 14:07:43 +0000
@@ -1275,8 +1275,10 @@
 		os_thread_yield();
 		goto retry;
 	}
-	if (trx->has_search_latch
-	    || NULL != UT_LIST_GET_FIRST(trx->trx_locks)) {
+
+	ut_ad(!trx->has_search_latch);
+
+	if (NULL != UT_LIST_GET_FIRST(trx->trx_locks)) {
 
 		conc_n_threads = os_atomic_increment_lint(&srv_conc_n_threads, 1);
 		enter_innodb_with_tickets(trx);
@@ -1319,7 +1321,9 @@
 	ulint                   sec;
 	ulint                   ms;
 
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 
@@ -1379,7 +1383,9 @@
 	/* If the transaction is not holding resources, let it sleep
 	for SRV_THREAD_SLEEP_DELAY microseconds, and try again then */
 
-	if (!has_slept && !trx->has_search_latch
+	ut_ad(!trx->has_search_latch);
+
+	if (!has_slept
 	    && NULL == UT_LIST_GET_FIRST(trx->trx_locks)) {
 
 		has_slept = TRUE; /* We let it sleep only once to avoid
@@ -1434,10 +1440,8 @@
 		return;
 	}
 
-	/* Release possible search system latch this thread has */
-	if (trx->has_search_latch) {
-		trx_search_latch_release_if_reserved(trx);
-	}
+	/* No-op for XtraDB. */
+	trx_search_latch_release_if_reserved(trx);
 
 	/* Add to the queue */
 	slot->reserved = TRUE;
@@ -1456,6 +1460,7 @@
 
 	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 
@@ -1507,7 +1512,9 @@
 	trx_t*	trx)	/*!< in: transaction object associated with the
 			thread */
 {
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 
@@ -1598,7 +1605,9 @@
 		os_event_set(slot->event);
 	}
 
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 }
@@ -1612,7 +1621,9 @@
 	trx_t*	trx)	/*!< in: transaction object associated with the
 			thread */
 {
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 
@@ -1885,7 +1896,9 @@
 	os_event_wait(event);
 	thd_wait_end(trx->mysql_thd);
 
+	ut_ad(!trx->has_search_latch);
 #ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
 	ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
 #endif /* UNIV_SYNC_DEBUG */
 
@@ -2047,7 +2060,8 @@
 	ulint	n_reserved;
 	ibool	ret;
 
-	ulint	btr_search_sys_subtotal;
+	ulong	btr_search_sys_constant;
+	ulong	btr_search_sys_variable;
 	ulint	lock_sys_subtotal;
 	ulint	recv_sys_subtotal;
 
@@ -2113,7 +2127,7 @@
 	ibuf_print(file);
 
 	for (i = 0; i < btr_search_index_num; i++) {
-		ha_print_info(file, btr_search_get_hash_index((index_id_t)i));
+		ha_print_info(file, btr_search_sys->hash_tables[i]);
 	}
 
 	fprintf(file,
@@ -2141,16 +2155,28 @@
 	fprintf(file,
 		"Total memory allocated by read views " ULINTPF "\n",
 		srv_read_views_memory);
-	/* Calcurate reserved memories */
-	if (btr_search_sys && btr_search_sys->hash_index[0]->heap) {
-		btr_search_sys_subtotal = mem_heap_get_size(btr_search_sys->hash_index[0]->heap);
-	} else {
-		btr_search_sys_subtotal = 0;
-		for (i=0; i < btr_search_sys->hash_index[0]->n_mutexes; i++) {
-			btr_search_sys_subtotal += mem_heap_get_size(btr_search_sys->hash_index[0]->heaps[i]);
-		}
+
+	/* Calculate AHI constant and variable memory allocations */
+
+	btr_search_sys_constant = 0;
+	btr_search_sys_variable = 0;
+
+	ut_ad(btr_search_sys->hash_tables);
+
+	for (i = 0; i < btr_search_index_num; i++) {
+		hash_table_t* ht = btr_search_sys->hash_tables[i];
+
+		ut_ad(ht);
+		ut_ad(ht->heap);
+
+		/* Multiple mutexes/heaps are currently never used for adaptive
+		hash index tables. */
+		ut_ad(!ht->n_mutexes);
+		ut_ad(!ht->heaps);
+
+		btr_search_sys_variable += mem_heap_get_size(ht->heap);
+		btr_search_sys_constant += ht->n_cells * sizeof(hash_cell_t);
 	}
-	btr_search_sys_subtotal *= btr_search_index_num;
 
 	lock_sys_subtotal = 0;
 	if (trx_sys) {
@@ -2175,12 +2201,9 @@
 			"    Lock system         %lu \t(%lu + %lu)\n"
 			"    Recovery system     %lu \t(%lu + %lu)\n",
 
-			(ulong) (btr_search_sys
-				? (btr_search_sys->hash_index[0]->n_cells * btr_search_index_num * sizeof(hash_cell_t)) : 0)
-			+ btr_search_sys_subtotal,
-			(ulong) (btr_search_sys
-				? (btr_search_sys->hash_index[0]->n_cells * btr_search_index_num * sizeof(hash_cell_t)) : 0),
-			(ulong) btr_search_sys_subtotal,
+			btr_search_sys_constant + btr_search_sys_variable,
+			btr_search_sys_constant,
+			btr_search_sys_variable,
 
 			(ulong) (buf_pool_from_array(0)->page_hash->n_cells * sizeof(hash_cell_t)),
 
@@ -2342,17 +2365,22 @@
 	buf_get_total_list_len(&LRU_len, &free_len, &flush_list_len);
 	buf_get_total_list_size_in_bytes(&buf_pools_list_size);
 
-	if (btr_search_sys && btr_search_sys->hash_index[0]->heap) {
-		mem_adaptive_hash = mem_heap_get_size(btr_search_sys->hash_index[0]->heap);
-	} else {
-		mem_adaptive_hash = 0;
-		for (i=0; i < btr_search_sys->hash_index[0]->n_mutexes; i++) {
-			mem_adaptive_hash += mem_heap_get_size(btr_search_sys->hash_index[0]->heaps[i]);
-		}
-	}
-	mem_adaptive_hash *= btr_search_index_num;
-	if (btr_search_sys) {
-		mem_adaptive_hash += (btr_search_sys->hash_index[0]->n_cells * btr_search_index_num * sizeof(hash_cell_t));
+	mem_adaptive_hash = 0;
+
+	ut_ad(btr_search_sys->hash_tables);
+
+	for (i = 0; i < btr_search_index_num; i++) {
+		hash_table_t*	ht = btr_search_sys->hash_tables[i];
+
+		ut_ad(ht);
+		ut_ad(ht->heap);
+		/* Multiple mutexes/heaps are currently never used for adaptive
+		hash index tables. */
+		ut_ad(!ht->n_mutexes);
+		ut_ad(!ht->heaps);
+
+		mem_adaptive_hash += mem_heap_get_size(ht->heap);
+		mem_adaptive_hash += ht->n_cells * sizeof(hash_cell_t);
 	}
 
 	mem_dictionary = (dict_sys ? ((dict_sys->table_hash->n_cells
@@ -2365,7 +2393,7 @@
 	export_vars.innodb_adaptive_hash_cells = 0;
 	export_vars.innodb_adaptive_hash_heap_buffers = 0;
 	for (i = 0; i < btr_search_index_num; i++) {
-		hash_table_t*	table = btr_search_get_hash_index((index_id_t)i);
+		hash_table_t*	table = btr_search_sys->hash_tables[i];
 
 		export_vars.innodb_adaptive_hash_cells
 			+= hash_get_n_cells(table);

=== modified file 'Percona-Server/storage/innobase/trx/trx0trx.c'
--- Percona-Server/storage/innobase/trx/trx0trx.c	2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/trx/trx0trx.c	2013-09-02 14:07:43 +0000
@@ -386,27 +386,6 @@
 }
 
 /********************************************************************//**
-Releases the search latch if trx has reserved it. */
-UNIV_INTERN
-void
-trx_search_latch_release_if_reserved(
-/*=================================*/
-	trx_t*	   trx) /*!< in: transaction */
-{
-	ulint	i;
-
-	if (trx->has_search_latch) {
-		for (i = 0; i < btr_search_index_num; i++) {
-			if (trx->has_search_latch & ((ulint)1 << i)) {
-				rw_lock_s_unlock(btr_search_latch_part[i]);
-			}
-		}
-
-		trx->has_search_latch = FALSE;
-	}
-}
-
-/********************************************************************//**
 Frees a transaction object. */
 UNIV_INTERN
 void
@@ -468,6 +447,9 @@
 	ut_a(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
 
 	ut_a(!trx->has_search_latch);
+#ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
+#endif
 
 	ut_a(trx->dict_operation_lock_mode == 0);
 
@@ -527,6 +509,9 @@
 	ut_a(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
 
 	ut_a(!trx->has_search_latch);
+#ifdef UNIV_SYNC_DEBUG
+	ut_ad(!btr_search_own_any());
+#endif
 
 	ut_a(trx->dict_operation_lock_mode == 0);