From f6765146c1b97bbb71f79adbd275dc2b6ca79333 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 25 Jun 2004 18:49:36 +0300
Subject: Added missing root user to mysql.user on windows. (Bug #4242) Set
 default max_allowed_packet to be able to read help tables even if an my.cnf
 file with this option is present. (Bug #3938) Don't use default arguments for
 ha_rnd_init() Simple code cleanups since last pull

---
 sql/handler.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index e76bda1a6cc..e278d1a5308 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -222,11 +222,9 @@ bool ha_caching_allowed(THD* thd, char* table_key,
 {
 #ifdef HAVE_INNOBASE_DB
   if (cache_type == HA_CACHE_TBL_ASKTRANSACT)
-    return innobase_query_caching_of_table_permitted(thd, table_key,
-                                                     key_length);
-  else
+    return innobase_query_caching_of_table_permitted(thd, table_key, key_length);
 #endif
-    return 1;
+  return 1;
 }
 
 int ha_init()
-- 
cgit v1.2.1