Skip to content

M
mariadb
Commit de479ab3 authored by Vasil Dimov's avatar Vasil Dimov
Browse files
Options

Followup to vasil.dimov@oracle.com-20111118115710-1xlezv0nbjz6s2ps 

Fix merge issues after discussing with Marko.
parent ed6ccecd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
storage/innobase/handler/ha_innodb.cc
View file @ de479ab3
...@@ -5261,9 +5261,6 @@ calc_row_difference( ...@@ -5261,9 +5261,6 @@ calc_row_difference(
dfield_set_null(&ufield->new_val); dfield_set_null(&ufield->new_val);
} }
/* XXX merge issues, should this be here?
ufield->extern_storage = FALSE;
*/
ufield->exp = NULL; ufield->exp = NULL;
ufield->orig_len = 0; ufield->orig_len = 0;
ufield->field_no = dict_col_get_clust_pos( ufield->field_no = dict_col_get_clust_pos(
......
storage/innobase/row/row0ins.c
View file @ de479ab3
...@@ -276,9 +276,7 @@ row_ins_sec_index_entry_by_modify( ...@@ -276,9 +276,7 @@ row_ins_sec_index_entry_by_modify(
err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor, err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor,
&heap, &dummy_big_rec, update, &heap, &dummy_big_rec, update,
0, thr, mtr); 0, thr, mtr);
/* XXX merge conflicts, should this be here?
ut_ad(!dummy_big_rec); ut_ad(!dummy_big_rec);
*/
} }
func_exit: func_exit:
mem_heap_free(heap); mem_heap_free(heap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7