bk commit into 6.0 tree (thek:1.2771)

[kpettersson]

Below is the list of changes that have just been committed into a local
6.0 repository of thek. When thek 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, 2008-01-03 17:05:58+01:00, thek@adventure.(none) +2 -0
  Fixed compiler warnings

  sql/sql_cache.cc@stripped, 2008-01-03 17:05:55+01:00, thek@adventure.(none) +0 -1
    Fixed compiler warnings by removing an unused variable.

  sql/sql_class.h@stripped, 2008-01-03 17:05:55+01:00, thek@adventure.(none) +1 -1
    Fixed compiler warnings.

diff -Nrup a/sql/sql_cache.cc b/sql/sql_cache.cc
--- a/sql/sql_cache.cc	2008-01-02 17:18:56 +01:00
+++ b/sql/sql_cache.cc	2008-01-03 17:05:55 +01:00
@@ -1126,7 +1126,6 @@ Query_cache::send_result_to_client(THD *
   Query_cache_block_table *block_table, *block_table_end;
   ulong tot_length;
   Query_cache_query_flags flags;
-  Query_cache_tls *query_cache_tls= &thd->query_cache_tls;
   DBUG_ENTER("Query_cache::send_result_to_client");
 
   /*
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2008-01-02 17:18:56 +01:00
+++ b/sql/sql_class.h	2008-01-03 17:05:55 +01:00
@@ -222,7 +222,7 @@ public:
   Query_cache_tls -- query cache thread local data.
 */
 
-class Query_cache_block;
+struct Query_cache_block;
 
 struct Query_cache_tls
 {