mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fix merge issues after discussing with Marko.
This commit is contained in:
Vasil Dimov 2011-11-21 15:26:24 +02:00
commit de479ab3b6
2 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/row/row0ins.c
View file

@ -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);