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).