bk commit into 5.1 tree (aivanov:1.2302)

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.1 repository of alexi. When alexi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2302 06/04/07 19:51:03 aivanov@stripped +1 -0
  Post-merge changes.

  sql/sql_cache.cc
    1.94 06/04/07 19:50:58 aivanov@stripped +1 -1
    Post-merge changes: Make InnoDB to release the adaptive hash
     index latch before MySQL acquires the query cache mutex.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/bugs/mysql-5.1-15758

--- 1.93/sql/sql_cache.cc	2006-04-07 19:41:01 +04:00
+++ 1.94/sql/sql_cache.cc	2006-04-07 19:50:58 +04:00
@@ -830,7 +830,7 @@
                           flags.sql_mode,
                           flags.max_sort_length,
                           flags.group_concat_max_len));
-#ifdef HAVE_INNOBASE_DB
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
     ha_release_temporary_latches(thd);
 #endif
     STRUCT_LOCK(&structure_guard_mutex);