summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-12-02 14:34:01 +0200
committermonty@hundin.mysql.fi <>2001-12-02 14:34:01 +0200
commit1d26537da53fee228b2f9d974d4806a06b76e33e (patch)
tree8e30a64d5c7aaa0ba8554c4c316cc9b76a6724ca /include
parent8a8617075a9e6ae3537bb8d81c8f4ab62e77fa44 (diff)
downloadmariadb-git-1d26537da53fee228b2f9d974d4806a06b76e33e.tar.gz
Query cache.
Remove some warnings
Diffstat (limited to 'include')
-rw-r--r--include/ft_global.h2
-rw-r--r--include/myisam.h2
-rw-r--r--include/myisammrg.h1
-rw-r--r--include/mysql_com.h4
4 files changed, 8 insertions, 1 deletions
diff --git a/include/ft_global.h b/include/ft_global.h
index 064dd7a6538..e4b63aecbb2 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -49,7 +49,7 @@ extern const char *ft_precompiled_stopwords[];
extern ulong ft_min_word_len;
extern ulong ft_max_word_len;
extern ulong ft_max_word_len_for_sort;
-extern char *ft_boolean_syntax;
+extern const char *ft_boolean_syntax;
int ft_init_stopwords(const char **);
void ft_free_stopwords(void);
diff --git a/include/myisam.h b/include/myisam.h
index 36c0de5034f..352b87c82c2 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -191,6 +191,8 @@ typedef struct st_columndef /* column information */
#endif
} MI_COLUMNDEF;
+/* invalidator function reference for Query Cache */
+typedef void (* invalidator_by_filename) (char * filename);
extern my_string myisam_log_filename; /* Name of logfile */
extern uint myisam_block_size;
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 1ae825b4b94..0230f077814 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -95,6 +95,7 @@ extern int myrg_lock_database(MYRG_INFO *file,int lock_type);
extern int myrg_create(const char *name, const char **table_names,
uint insert_method, my_bool fix_names);
extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function);
+extern void myrg_extrafunc(MYRG_INFO *info,invalidator_by_filename inv);
extern ha_rows myrg_records_in_range(MYRG_INFO *info,int inx,
const byte *start_key,uint start_key_len,
enum ha_rkey_function start_search_flag,
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 048b6b98918..16f603516f9 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -78,6 +78,9 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
#define REFRESH_FAST 32768 /* Intern flag */
+#define REFRESH_QUERY_CACHE 65536 /* flush query cache */
+#define REFRESH_QUERY_CACHE_FREE 0x10000L /* pack query cache */
+
#define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */
#define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */
#define CLIENT_LONG_FLAG 4 /* Get all column flags */
@@ -126,6 +129,7 @@ typedef struct st_net {
unsigned char reading_or_writing;
char save_char;
my_bool no_send_ok;
+ gptr query_cache_query;
} NET;
#define packet_error (~(unsigned long) 0)