summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authormonty@mishka.mysql.fi <>2003-10-03 02:08:49 +0300
committermonty@mishka.mysql.fi <>2003-10-03 02:08:49 +0300
commit0d21572d0104f0f38179adc10f8e36feac5bfd7c (patch)
treead64eadefb799049105e252455ddd9ea329aa593 /sql/mysql_priv.h
parenta5d9c195d332f324f0f532d2e385601cace18b6a (diff)
parent89fd19f430949834d7ad4a0a44befe914b9534a0 (diff)
downloadmariadb-git-0d21572d0104f0f38179adc10f8e36feac5bfd7c.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index ada3db5eccc..3d5ca148228 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -322,6 +322,13 @@ typedef compare_func_creator (*chooser_compare_func_creator)(bool invert);
#include "opt_range.h"
#ifdef HAVE_QUERY_CACHE
+struct Query_cache_query_flags
+{
+ unsigned int client_long_flag:1;
+ uint charset_num;
+ ha_rows limit;
+};
+#define QUERY_CACHE_FLAGS_SIZE sizeof(Query_cache_query_flags)
#include "sql_cache.h"
#define query_cache_store_query(A, B) query_cache.store_query(A, B)
#define query_cache_destroy() query_cache.destroy()
@@ -335,6 +342,7 @@ typedef compare_func_creator (*chooser_compare_func_creator)(bool invert);
#define query_cache_invalidate_by_MyISAM_filename_ref \
&query_cache_invalidate_by_MyISAM_filename
#else
+#define QUERY_CACHE_FLAGS_SIZE 0
#define query_cache_store_query(A, B)
#define query_cache_destroy()
#define query_cache_result_size_limit(A)