diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-11-21 15:26:24 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-11-21 15:26:24 +0200 |
| commit | de479ab3b61fd7df294a6b07a11bd60d10299789 (patch) | |
| tree | 1017d81018cfe1977630b602ec22e645a08ce89b /storage | |
| parent | ed6ccecd3cdce0295d94123e13a40dac2cd696d5 (diff) | |
| download | mariadb-git-de479ab3b61fd7df294a6b07a11bd60d10299789.tar.gz | |
Followup to vasil.dimov@oracle.com-20111118115710-1xlezv0nbjz6s2ps
Fix merge issues after discussing with Marko.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/row/row0ins.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 16cb61fd22e..4e01f7e1cf4 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -5261,9 +5261,6 @@ calc_row_difference( dfield_set_null(&ufield->new_val); } - /* XXX merge issues, should this be here? - ufield->extern_storage = FALSE; - */ ufield->exp = NULL; ufield->orig_len = 0; ufield->field_no = dict_col_get_clust_pos( diff --git a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c index fc1ff694e32..6e311ce2e80 100644 --- a/storage/innobase/row/row0ins.c +++ b/storage/innobase/row/row0ins.c @@ -276,9 +276,7 @@ row_ins_sec_index_entry_by_modify( err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor, &heap, &dummy_big_rec, update, 0, thr, mtr); - /* XXX merge conflicts, should this be here? ut_ad(!dummy_big_rec); - */ } func_exit: mem_heap_free(heap); |