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

Fix merge issues after discussing with Marko.

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(

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