diff options
| author | unknown <aivanov@mysql.com> | 2006-04-07 23:58:17 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-07 23:58:17 +0400 |
| commit | 372901addf38deb86a23cafd1ad9ac3e7fae3b0e (patch) | |
| tree | 8340715f0769f9454ab699e14c946049be4b85ca /sql/sql_class.cc | |
| parent | b3dad934787dbdc0aba7ea6ab4559eb0e2880e25 (diff) | |
| download | mariadb-git-372901addf38deb86a23cafd1ad9ac3e7fae3b0e.tar.gz | |
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).
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 59391a333c3..5a6bbe01183 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -919,14 +919,12 @@ bool select_send::send_data(List<Item> &items) return 0; } -#ifdef HAVE_INNOBASE_DB /* We may be passing the control from mysqld to the client: release the InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved by thd */ ha_release_temporary_latches(thd); -#endif List_iterator_fast<Item> li(items); Protocol *protocol= thd->protocol; @@ -956,12 +954,10 @@ bool select_send::send_data(List<Item> &items) bool select_send::send_eof() { -#ifdef HAVE_INNOBASE_DB /* We may be passing the control from mysqld to the client: release the InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved by thd */ ha_release_temporary_latches(thd); -#endif /* Unlock tables before sending packet to gain some speed */ if (thd->lock) |