diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
| commit | a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb (patch) | |
| tree | 8bc0efc14fbc8ff396dec2a802545bfc8ec7c6ca /sql/sql_cache.h | |
| parent | 68262ba648886e2d5f35fc85e3cc45df7ffd9ae5 (diff) | |
| download | mariadb-git-a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb.tar.gz | |
Fixed issues with partitions and create temporary table SELECT ...
Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.
sql/sql_partition.cc:
Full merge with 5.6
sql/sql_table.cc:
Merged all ddl_logging code
sql/strfunc.cc:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index 7444d444cf9..2d6392911f1 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -190,6 +190,7 @@ struct Query_cache_table Query_cache_table() {} /* Remove gcc warning */ char *tbl; uint32 key_len; + uint8 suffix_len; /* For partitioned tables */ uint8 table_type; /* unique for every engine reference */ qc_engine_callback callback_func; @@ -210,6 +211,8 @@ struct Query_cache_table inline void table(char *table_arg) { tbl= table_arg; } inline uint32 key_length() { return key_len; } inline void key_length(uint32 len) { key_len= len; } + inline uint8 suffix_length() { return suffix_len; } + inline void suffix_length(uint8 len) { suffix_len= len; } inline uint8 type() { return table_type; } inline void type(uint8 t) { table_type= t; } inline qc_engine_callback callback() { return callback_func; } @@ -490,7 +493,8 @@ protected: unsigned pkt_nr); my_bool insert_table(uint key_len, char *key, Query_cache_block_table *node, - uint32 db_length, uint8 cache_type, + uint32 db_length, uint8 suffix_length_arg, + uint8 cache_type, qc_engine_callback callback, ulonglong engine_data, my_bool hash); |