null+****@clear*****
null+****@clear*****
2011年 9月 25日 (日) 20:28:07 JST
Kouhei Sutou 2011-09-25 11:28:07 +0000 (Sun, 25 Sep 2011) New Revision: 0c44d6b5d3893bd3dea08b0af9408d3acb1f16cd Log: [wrapper] use meaningful name. Modified files: ha_mroonga.cc Modified: ha_mroonga.cc (+3 -3) =================================================================== --- ha_mroonga.cc 2011-09-25 11:11:49 +0000 (b880643) +++ ha_mroonga.cc 2011-09-25 11:28:07 +0000 (f78877f) @@ -5029,14 +5029,14 @@ int ha_mroonga::wrapper_ft_read(uchar *buf) int error; MRN_DBUG_ENTER_METHOD(); do { - record_id = grn_table_cursor_next(ctx, cursor); - if (record_id == GRN_ID_NIL) { + grn_id found_record_id = grn_table_cursor_next(ctx, cursor); + if (found_record_id == GRN_ID_NIL) { error = HA_ERR_END_OF_FILE; clear_cursor(); break; } else { GRN_BULK_REWIND(&pkey); - grn_obj_get_value(ctx, key_accessor, record_id, &pkey); + grn_obj_get_value(ctx, key_accessor, found_record_id, &pkey); MRN_SET_WRAP_SHARE_KEY(share, table->s); MRN_SET_WRAP_TABLE_KEY(this, table); #ifdef MRN_HANDLER_HAVE_HA_INDEX_READ_IDX_MAP