Undoing mikael@mysql.com-20081015100345-8tu2vmh7mzs60c23

"Patch to fix bug 38551": it was a manual backport (2008-10-15) of
http://lists.mysql.com/commits/56418.
But that was an early, non-final patch from the fixer of this bug (TheK):
after that backport was made by Mikael, TheK decided to do a different fix,
which was finally pushed into 6.0.
Then 5.1's code was changed for some other reasons, so now we have a
conflict between the old never-approved TheK patch backported to Summit and
the latest 5.1. The backport cannot stay, it has to be removed due to
the conflict, and then rewritten if desired.

1 files changed, 0 insertions, 11 deletions

diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index a8636381956..777ddd39280 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -279,8 +279,6 @@ private:
   enum Cache_lock_status { UNLOCKED, LOCKED_NO_WAIT, LOCKED };
   Cache_lock_status m_cache_lock_status;
 
-  bool m_query_cache_is_disabled;
-  
   void free_query_internal(Query_cache_block *point);
   void invalidate_table_internal(THD *thd, uchar *key, uint32 key_length);
 
@@ -437,14 +435,6 @@ protected:
   /* register query in cache */
   void store_query(THD *thd, TABLE_LIST *used_tables);
 
-  /**
-    At startup the user has an option to disable the query cache
-    to avoid locking the structure_guard_mutex.
-    This option is enabled by explicitly setting query_cache_type=OFF
-    in the command line.
-  */
-  void disable_query_cache(void) { m_query_cache_is_disabled= TRUE; }
-  
   /*
     Check if the query is in the cache and if this is true send the
     data to client.
@@ -477,7 +467,6 @@ protected:
   friend void query_cache_end_of_result(THD *thd);
   friend void query_cache_abort(NET *net);
 
-  bool is_disabled(void) { return m_query_cache_is_disabled; }
   /*
     The following functions are only used when debugging
     We don't protect these with ifndef DBUG_OFF to not have to recompile