Commit 69da0b11 authored by unknown's avatar unknown

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0

into sinisa.nasamreza.org:/mnt/work/petica


sql/handler.cc:
  Auto merged
parents 3fefe780 3667ce1b
......@@ -1115,10 +1115,12 @@ int handler::delete_all_rows()
bool handler::caching_allowed(THD* thd, char* table_key,
uint key_length, uint8 cache_type)
{
#ifdef HAVE_INNOBASE_DB
if (cache_type == HA_CACHE_TBL_ASKTRANSACT)
return innobase_query_caching_of_table_permitted(thd, table_key,
key_length);
else
#endif
return 1;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment