Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1


mysql-test/r/innodb_cache.result:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index dcc732ba25a..734b0e3ccf6 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -839,6 +839,16 @@ int handler::delete_all_rows()
   return (my_errno=HA_ERR_WRONG_COMMAND);
 }
 
+bool handler::caching_allowed(THD* thd, char* table_key, 
+			      uint key_length, uint8 cache_type)
+{
+  if (cache_type == HA_CACHE_TBL_ASKTRANSACT)
+    return innobase_query_caching_of_table_permitted(thd, table_key,
+						     key_length);
+  else
+    return 1;
+}
+
 /****************************************************************************
 ** Some general functions that isn't in the handler class
 ****************************************************************************/