mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
merge with 4.1
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user