diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-14 22:15:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-15 18:42:31 +0200 |
| commit | cf1a09e42f695bcd24dd8a4a928cd1f560c3c00a (patch) | |
| tree | 1d9c502f2529f0240fb91d88ed4012c9a9989d2e /sql/table.cc | |
| parent | 2edcf8f9ff2a1afb1d2bd5028a93b5f07ef0644e (diff) | |
| download | mariadb-git-cf1a09e42f695bcd24dd8a4a928cd1f560c3c00a.tar.gz | |
MDEV-6107 merge default_tmp_storage_engine
Adapt default_tmp_storage_engine implementation from mysql-5.6
New feature (as compared to 5.6), default_tmp_storage_engine=NULL
means that temporary tables will use default_storage_engine value.
This makes the behavior backward compatible.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 23761e02831..d720a16f6e5 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -982,7 +982,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, #ifdef WITH_PARTITION_STORAGE_ENGINE { LEX_STRING name= { (char*)extra2, length }; - share->default_part_plugin= ha_resolve_by_name(NULL, &name); + share->default_part_plugin= ha_resolve_by_name(NULL, &name, false); if (!share->default_part_plugin) goto err; } @@ -1136,7 +1136,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, name.str= (char*) next_chunk + 2; name.length= str_db_type_length; - plugin_ref tmp_plugin= ha_resolve_by_name(thd, &name); + plugin_ref tmp_plugin= ha_resolve_by_name(thd, &name, false); if (tmp_plugin != NULL && !plugin_equals(tmp_plugin, se_plugin)) { if (se_plugin) |