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 /storage/myisammrg/ha_myisammrg.cc | |
| 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 'storage/myisammrg/ha_myisammrg.cc')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 7772b0bb15e..2ac8df005d9 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -1672,7 +1672,7 @@ my_bool ha_myisammrg::register_query_cache_dependant_tables(THD *thd There are not callback function for for MyISAM, and engine data */ if (!cache->insert_table(key_length, key, (*block_table), - db_length, + db_length, 0, table_cache_type(), 0, 0, TRUE)) DBUG_RETURN(TRUE); |