diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-12-24 18:37:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-12-25 15:18:21 +0100 |
| commit | 6d8b1bd6204899afa57121cf1f7adf305118d380 (patch) | |
| tree | e7a8923edbd753ba4117408b73eec9cd9924b159 | |
| parent | c881d82c931c52e64f7c8d252c12189d299d6c97 (diff) | |
| download | mariadb-git-6d8b1bd6204899afa57121cf1f7adf305118d380.tar.gz | |
cleanup: ha_partition::update_create_info
| -rw-r--r-- | sql/ha_partition.cc | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 0649d5d44aa..459af18f737 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2180,38 +2180,19 @@ void ha_partition::update_create_info(HA_CREATE_INFO *create_info) DBUG_ASSERT(sub_elem); part= i * num_subparts + j; DBUG_ASSERT(part < m_file_tot_parts && m_file[part]); - if (ha_legacy_type(m_file[part]->ht) == DB_TYPE_INNODB) - { - dummy_info.data_file_name= dummy_info.index_file_name = NULL; - m_file[part]->update_create_info(&dummy_info); - - if (dummy_info.data_file_name || sub_elem->data_file_name) - { - sub_elem->data_file_name = (char*) dummy_info.data_file_name; - } - if (dummy_info.index_file_name || sub_elem->index_file_name) - { - sub_elem->index_file_name = (char*) dummy_info.index_file_name; - } - } + dummy_info.data_file_name= dummy_info.index_file_name = NULL; + m_file[part]->update_create_info(&dummy_info); + sub_elem->data_file_name = (char*) dummy_info.data_file_name; + sub_elem->index_file_name = (char*) dummy_info.index_file_name; } } else { DBUG_ASSERT(m_file[i]); - if (ha_legacy_type(m_file[i]->ht) == DB_TYPE_INNODB) - { - dummy_info.data_file_name= dummy_info.index_file_name= NULL; - m_file[i]->update_create_info(&dummy_info); - if (dummy_info.data_file_name || part_elem->data_file_name) - { - part_elem->data_file_name = (char*) dummy_info.data_file_name; - } - if (dummy_info.index_file_name || part_elem->index_file_name) - { - part_elem->index_file_name = (char*) dummy_info.index_file_name; - } - } + dummy_info.data_file_name= dummy_info.index_file_name= NULL; + m_file[i]->update_create_info(&dummy_info); + part_elem->data_file_name = (char*) dummy_info.data_file_name; + part_elem->index_file_name = (char*) dummy_info.index_file_name; } } DBUG_VOID_RETURN; |