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/ha_partition.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/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 05b285c0eb9..eeb2ee5dec5 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -643,7 +643,10 @@ public: private: my_bool reg_query_cache_dependant_table(THD *thd, - char *key, uint key_len, uint8 type, + char *engine_key, + uint engine_key_len, + char *query_key, uint query_key_len, + uint8 type, Query_cache *cache, Query_cache_block_table **block_table, |