bk commit into 5.1 tree (hartmut:1.2394)

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-16 15:14:23+01:00, hartmut@stripped +1 -0
  Merge hholzgraefe@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
  MERGE: 1.2372.4.5

  sql/sql_class.cc@stripped, 2007-01-16 15:14:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.301.1.5

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1/RESYNC

--- 1.304/sql/sql_class.cc	2007-01-16 15:14:32 +01:00
+++ 1.305/sql/sql_class.cc	2007-01-16 15:14:32 +01:00
@@ -261,7 +261,9 @@
 #endif
   client_capabilities= 0;                       // minimalistic client
   net.last_error[0]=0;                          // If error on boot
+#ifdef HAVE_QUERY_CACHE
   query_cache_init_query(&net);                 // If error on boot
+#endif
   ull=0;
   system_thread= NON_SYSTEM_THREAD;
   cleanup_done= abort_on_warning= no_warnings_for_error= 0;