null+****@clear*****
null+****@clear*****
2011年 10月 27日 (木) 15:11:33 JST
Kouhei Sutou 2011-10-27 06:11:33 +0000 (Thu, 27 Oct 2011) New Revision: a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa Log: unify variable name: multicolumn_key -> multiple_column_index. Modified files: ha_mroonga.cc Modified: ha_mroonga.cc (+4 -3) =================================================================== --- ha_mroonga.cc 2011-10-27 06:09:51 +0000 (068bf35) +++ ha_mroonga.cc 2011-10-27 06:11:33 +0000 (2d9d3cf) @@ -7323,7 +7323,8 @@ int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info, TABLE_SHARE tmp_table_share; char **key_parser; uint *key_parser_length; - bool have_multicolumn_key = FALSE; + bool have_multiple_column_index = FALSE; + MRN_DBUG_ENTER_METHOD(); tmp_table_share.keys = n_keys + num_of_keys; if (!(tmp_share = (MRN_SHARE *) @@ -7359,10 +7360,10 @@ int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info, !(key_info[i].flags & HA_FULLTEXT) ) { mrn_set_bitmap_by_key(table->read_set, &key_info[i]); - have_multicolumn_key = TRUE; + have_multiple_column_index = TRUE; } } - if (!res && have_multicolumn_key) + if (!res && have_multiple_column_index) { res = storage_add_index_multiple_columns(key_info, num_of_keys, index_columns);