diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
| commit | 3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (patch) | |
| tree | cefa82212b688d12a7ca180f7a0a8f32715e2a79 /storage/mroonga/mrn_table.hpp | |
| parent | 16327fc2e76e9215059894b461e8aca7f989da00 (diff) | |
| parent | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (diff) | |
| download | mariadb-git-3f9040085a0de4976f55bc7e4a2fa5fa8d923100.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev17096
Diffstat (limited to 'storage/mroonga/mrn_table.hpp')
| -rw-r--r-- | storage/mroonga/mrn_table.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/mroonga/mrn_table.hpp b/storage/mroonga/mrn_table.hpp index 422d48d234d..70af3ab512f 100644 --- a/storage/mroonga/mrn_table.hpp +++ b/storage/mroonga/mrn_table.hpp @@ -97,6 +97,7 @@ struct st_mrn_slot_data #define MRN_SET_WRAP_ALTER_KEY(file, ha_alter_info) \ alter_table_operations base_handler_flags = ha_alter_info->handler_flags; \ + ha_table_option_struct* base_option_struct = ha_alter_info->create_info->option_struct; \ KEY *base_key_info_buffer = ha_alter_info->key_info_buffer; \ uint base_key_count = ha_alter_info->key_count; \ uint base_index_drop_count = ha_alter_info->index_drop_count; \ @@ -104,6 +105,7 @@ struct st_mrn_slot_data uint base_index_add_count = ha_alter_info->index_add_count; \ uint *base_index_add_buffer = ha_alter_info->index_add_buffer; \ ha_alter_info->handler_flags = file->alter_handler_flags; \ + ha_alter_info->create_info->option_struct = wrap_altered_table->s->option_struct; \ ha_alter_info->key_info_buffer = file->alter_key_info_buffer; \ ha_alter_info->key_count = file->alter_key_count; \ ha_alter_info->index_drop_count = file->alter_index_drop_count; \ @@ -113,6 +115,7 @@ struct st_mrn_slot_data #define MRN_SET_BASE_ALTER_KEY(share, table_share) \ ha_alter_info->handler_flags = base_handler_flags; \ + ha_alter_info->create_info->option_struct = base_option_struct; \ ha_alter_info->key_info_buffer = base_key_info_buffer; \ ha_alter_info->key_count = base_key_count; \ ha_alter_info->index_drop_count = base_index_drop_count; \ |