Kouhei Sutou
null+****@clear*****
Sat Sep 24 00:36:36 JST 2016
Kouhei Sutou 2016-09-24 00:36:36 +0900 (Sat, 24 Sep 2016) New Revision: 77b432d49cd93513a8b66b0c77b9ec8b08e0f9ec https://github.com/mroonga/mroonga/commit/77b432d49cd93513a8b66b0c77b9ec8b08e0f9ec Message: Use GRN_OBJ_FIN() for temporary object Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+4 -4) =================================================================== --- ha_mroonga.cpp 2016-09-24 00:36:16 +0900 (f318f9c) +++ ha_mroonga.cpp 2016-09-24 00:36:36 +0900 (68ac249) @@ -5805,12 +5805,12 @@ int ha_mroonga::storage_write_row(uchar *buf) error = mrn_change_encoding(ctx, field->charset()); if (error) { - grn_obj_unlink(ctx, &colbuf); + GRN_OBJ_FIN(ctx, &colbuf); goto err; } error = generic_store_bulk(field, &colbuf); if (error) { - grn_obj_unlink(ctx, &colbuf); + GRN_OBJ_FIN(ctx, &colbuf); goto err; } @@ -5849,13 +5849,13 @@ int ha_mroonga::storage_write_row(uchar *buf) grn_obj_set_value(ctx, column, record_id, &colbuf, GRN_OBJ_SET); } if (ctx->rc) { - grn_obj_unlink(ctx, &colbuf); + GRN_OBJ_FIN(ctx, &colbuf); my_message(ER_ERROR_ON_WRITE, ctx->errbuf, MYF(0)); error = ER_ERROR_ON_WRITE; goto err; } } - grn_obj_unlink(ctx, &colbuf); + GRN_OBJ_FIN(ctx, &colbuf); error = storage_write_row_multiple_column_indexes(buf, record_id); if (error) { -------------- next part -------------- HTML����������������������������...下載
