summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2004-01-20 17:01:34 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2004-01-20 17:01:34 +0200
commit69da0b11fdf1ba081123a0a98eb010c274607200 (patch)
treed9bd51b81e2b93a4bf1c4edefa332b1995dbb8cd /sql/handler.cc
parent3fefe780ff8d3f8899cd051b62362eed30ec119d (diff)
parent3667ce1bf4a59cdab9458a24038a48e590a1e5dd (diff)
downloadmariadb-git-69da0b11fdf1ba081123a0a98eb010c274607200.tar.gz
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica sql/handler.cc: Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index e9eecabaa84..0191a7139cd 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -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;
}