From 372901addf38deb86a23cafd1ad9ac3e7fae3b0e Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2006 23:58:17 +0400 Subject: Fixed BUG#15758: "Holding adaptive search latch in innobase_query_caching_of_table_permitted()". Applied the patch due to Heikki Tuuri. Also removed superfluous #ifdefs. sql/sql_cache.cc: Applied the patch due to Heikki Tuuri. Query_cache::store_query(): Make InnoDB to release the adaptive hash index latch before MySQL acquires the query cache mutex. sql/sql_class.cc: Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg). sql/sql_cursor.cc: Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg). --- sql/sql_cursor.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/sql_cursor.cc') diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 33ad27b9d14..2784e71ccae 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -445,9 +445,8 @@ Sensitive_cursor::fetch(ulong num_rows) if (error == NESTED_LOOP_CURSOR_LIMIT) join->resume_nested_loop= TRUE; -#ifdef USING_TRANSACTIONS ha_release_temporary_latches(thd); -#endif + /* Grab free_list here to correctly free it in close */ thd->restore_active_arena(this, &backup_arena); -- cgit v1.2.1