branches/innodb+: ibuf_delete(),

row_purge_remove_sec_if_poss_low_nonbuffered(): Add debug assertions
that records to be purged must have been marked for deletion.

ibuf/ibuf0ibuf.c

@@ -3706,6 +3706,10 @@ ibuf_delete(
 		/* Refuse to delete the last record. */
 		ut_a(page_get_n_recs(page) > 1);
 
+		/* The record should have been marked for deletion. */
+		ut_ad(REC_INFO_DELETED_FLAG
+		      & rec_get_info_bits(rec, page_is_comp(page)));
+
 		lock_update_delete(block, rec);
 
 		if (!page_zip) {

row/row0purge.c

@@ -275,7 +275,11 @@ row_purge_remove_sec_if_poss_low_nonbuffered(
 	btr_pcur_commit_specify_mtr(&(node->pcur), &mtr_vers);
 
 	if (!old_has) {
-		/* Remove the index record */
+		/* Remove the index record, which should have been
+		marked for deletion. */
+		ut_ad(REC_INFO_DELETED_FLAG
+		      & rec_get_info_bits(btr_cur_get_rec(btr_cur),
+					  dict_table_is_comp(index->table)));
 
 		if (mode == BTR_MODIFY_LEAF) {
 			success = btr_cur_optimistic_delete(btr_cur, &mtr);