From 774a4cb5474f932a04ced63bf5751201f2fe8d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 17 Sep 2018 17:50:56 +0300 Subject: 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. --- storage/mroonga/mrn_table.hpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'storage/mroonga/mrn_table.hpp') 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; \ -- cgit v1.2.1