Commit 774a4cb5 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent ac24289e
...@@ -97,6 +97,7 @@ struct st_mrn_slot_data ...@@ -97,6 +97,7 @@ struct st_mrn_slot_data
#define MRN_SET_WRAP_ALTER_KEY(file, ha_alter_info) \ #define MRN_SET_WRAP_ALTER_KEY(file, ha_alter_info) \
alter_table_operations base_handler_flags = ha_alter_info->handler_flags; \ 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; \ KEY *base_key_info_buffer = ha_alter_info->key_info_buffer; \
uint base_key_count = ha_alter_info->key_count; \ uint base_key_count = ha_alter_info->key_count; \
uint base_index_drop_count = ha_alter_info->index_drop_count; \ uint base_index_drop_count = ha_alter_info->index_drop_count; \
...@@ -104,6 +105,7 @@ struct st_mrn_slot_data ...@@ -104,6 +105,7 @@ struct st_mrn_slot_data
uint base_index_add_count = ha_alter_info->index_add_count; \ uint base_index_add_count = ha_alter_info->index_add_count; \
uint *base_index_add_buffer = ha_alter_info->index_add_buffer; \ uint *base_index_add_buffer = ha_alter_info->index_add_buffer; \
ha_alter_info->handler_flags = file->alter_handler_flags; \ 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_info_buffer = file->alter_key_info_buffer; \
ha_alter_info->key_count = file->alter_key_count; \ ha_alter_info->key_count = file->alter_key_count; \
ha_alter_info->index_drop_count = file->alter_index_drop_count; \ ha_alter_info->index_drop_count = file->alter_index_drop_count; \
...@@ -113,6 +115,7 @@ struct st_mrn_slot_data ...@@ -113,6 +115,7 @@ struct st_mrn_slot_data
#define MRN_SET_BASE_ALTER_KEY(share, table_share) \ #define MRN_SET_BASE_ALTER_KEY(share, table_share) \
ha_alter_info->handler_flags = base_handler_flags; \ 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_info_buffer = base_key_info_buffer; \
ha_alter_info->key_count = base_key_count; \ ha_alter_info->key_count = base_key_count; \
ha_alter_info->index_drop_count = base_index_drop_count; \ ha_alter_info->index_drop_count = base_index_drop_count; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment