Skip to content
Permalink
Browse files
Mroonga follow-up fix for MDEV-16328
Now that ha_innobase::prepare_inplace_alter_table() is accessing
ha_alter_info->create_info->option_struct, we must initialize it in
the Mroonga wrapper for ALTER TABLE based on the parsed table options
for the wrap_altered_table.
  • Loading branch information
dr-m committed Sep 17, 2018
1 parent ac24289 commit 774a4cb
Showing 1 changed file with 3 additions and 0 deletions.
@@ -97,13 +97,15 @@ 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; \
KEY **base_index_drop_buffer = ha_alter_info->index_drop_buffer; \
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; \

0 comments on commit 774a4cb

Please sign in to comment.