Kouhei Sutou
null+****@clear*****
Fri Aug 22 23:17:50 JST 2014
Kouhei Sutou 2014-08-22 23:17:50 +0900 (Fri, 22 Aug 2014) New Revision: 01515739246bdcb08e590a52ce85a2daea9f0601 https://github.com/mroonga/mroonga/commit/01515739246bdcb08e590a52ce85a2daea9f0601 Message: wrappr: make drop_index() wrapper mode ready Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+4 -8) =================================================================== --- ha_mroonga.cpp 2014-08-22 23:16:01 +0900 (9ef8674) +++ ha_mroonga.cpp 2014-08-22 23:17:50 +0900 (4018ad0) @@ -8535,7 +8535,7 @@ int ha_mroonga::drop_index(MRN_SHARE *target_share, uint key_index) int target_name_length; KEY *key_info = target_share->table_share->key_info; - if (target_share->index_table && target_share->index_table[key_index]) { + if (!target_share->wrapper_mode && target_share->index_table[key_index]) { const char *table_name = target_share->index_table[key_index]; snprintf(target_name, GRN_TABLE_MAX_KEY_SIZE, "%s.%s", table_name, key_info[key_index].name); @@ -13247,13 +13247,9 @@ bool ha_mroonga::wrapper_inplace_alter_table( ++j; } DBUG_PRINT("info", ("mroonga: key_name=%s", key->name)); - mrn::IndexTableName index_table_name(mapper.table_name(), key->name); - grn_obj *index_table = grn_ctx_get(ctx, - index_table_name.c_str(), - index_table_name.length()); - if (index_table) { - grn_obj_remove(ctx, index_table); - } + error = drop_index(share, j); + if (error) + DBUG_RETURN(true); grn_index_tables[j] = NULL; grn_index_columns[j] = NULL; } -------------- next part -------------- HTML����������������������������...Download