Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
90211196 · unknown · 9ac61d15 · 541486f3 · 90211196 · 90211196
Commit 90211196 authored Aug 15, 2003 by unknown
Showing with 14 additions and 1036 deletions

mysql-test/r/query_cache.result mysql-test/r/query_cache.result +2 -517

mysql-test/t/query_cache.test mysql-test/t/query_cache.test +12 -518

sql/sql_class.h sql/sql_class.h +0 -1

No files found.
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -452,7 +452,6 @@ public:
  /* variables.transaction_isolation is reset to this after each commit */
  enum_tx_isolation session_tx_isolation;
  char	     scramble[9];
-  uint8	     query_cache_type;		// type of query cache processing
  bool       slave_thread;
  bool	     set_query_id,locked,count_cuted_fields,some_tables_deleted;
  bool	     no_errors, allow_sum_func, password, fatal_error;