bk commit into 5.0 tree (aivanov:1.2140) BUG#15758

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 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.2140 06/04/07 19:36:16 aivanov@stripped +1 -0
  Fixed BUG#15758: "Holding adaptive search latch in
   innobase_query_caching_of_table_permitted()".
   Applied the patch by Heikki Tuuri.

  sql/sql_cache.cc
    1.91 06/04/07 19:36:11 aivanov@stripped +3 -0
    Query_cache::store_query(): Make InnoDB to release the adaptive
     hash index latch before MyySQL 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.0-151758-work

--- 1.90/sql/sql_cache.cc	2006-01-04 17:46:44 +03:00
+++ 1.91/sql/sql_cache.cc	2006-04-07 19:36:11 +04:00
@@ -830,6 +830,9 @@
                           flags.sql_mode,
                           flags.max_sort_length,
                           flags.group_concat_max_len));
+#ifdef HAVE_INNOBASE_DB
+    ha_release_temporary_latches(thd);
+#endif
     STRUCT_LOCK(&structure_guard_mutex);
 
     if (query_cache_size == 0)