diff options
| author | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
| commit | afbe601302fc59c498437321b296ed6c8d360564 (patch) | |
| tree | 23bcc9a71fe7237887a111b158e30f5a6bb665d3 /sql/sql_cache.h | |
| parent | 67456bb970cc949ceb5779b230592e455843c35c (diff) | |
| parent | 541883f9d89a8d38affba60bf9506289a6232da1 (diff) | |
| download | mariadb-git-afbe601302fc59c498437321b296ed6c8d360564.tar.gz | |
merge with 4.1
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 10 |
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() |