Merge on pull

BitKeeper/etc/ignore:
  auto-union
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 3 insertions, 7 deletions

diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index b54bc4f7b7b..93d89aeae4f 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -53,10 +53,6 @@
    of list of free blocks */
 #define QUERY_CACHE_MEM_BIN_TRY                 5
 
-/* query flags masks */
-#define QUERY_CACHE_CLIENT_LONG_FLAG_MASK	0x80
-#define QUERY_CACHE_CHARSET_CONVERT_MASK	0x7F
-
 /* packing parameters */
 #define QUERY_CACHE_PACK_ITERATION		2
 #define QUERY_CACHE_PACK_LIMIT			(512*1024L)
@@ -148,14 +144,14 @@ struct Query_cache_query
 struct Query_cache_table
 {
   char *tbl;
-  uint key_len;
+  uint32 key_len;
   uint8 table_type;
 
   inline char *db()			     { return (char *) data(); }
   inline char *table()			     { return tbl; }
   inline void table(char *table)	     { tbl= table; }
-  inline uint key_length()                   { return key_len; }
-  inline void key_length(uint len)           { key_len= len; }
+  inline uint32 key_length()                 { return key_len; }
+  inline void key_length(uint32 len)         { key_len= len; }
   inline uint8 type()                        { return table_type; }
   inline void type(uint8 t)                  { table_type= t; }
   inline gptr data()