bzr push into mysql-trunk-wl6255 branch (marko.makela:3863 to 3864)

[marko.makela]

 3864 Marko Mäkelä	2012-05-24
      row_undo_mod_remove_clust_low(): Enable a debug assertion and
      add comments on DB_TRX_ID and the delete-mark flag.

    modified:
      storage/innobase/row/row0umod.cc
 3863 Marko Mäkelä	2012-05-24
      WL#6255 preparation, to allow creation of a dummy que_thr_t object.
      
      pars_complete_graph_for_exec(): Allow node=NULL.

    modified:
      storage/innobase/include/pars0pars.h
      storage/innobase/pars/pars0pars.cc
=== modified file 'storage/innobase/row/row0umod.cc'
--- a/storage/innobase/row/row0umod.cc	revid:marko.makela@stripped3eygo
+++ b/storage/innobase/row/row0umod.cc	revid:marko.makela@stripped
@@ -194,13 +194,11 @@ row_undo_mod_remove_clust_low(
 
 	btr_cur = btr_pcur_get_btr_cur(&node->pcur);
 
-#if 0 /* TODO: find out why these fail */
-	ut_ad(rec_get_trx_id(btr_cur_get_rec(btr_cur),
-			     btr_cur_get_index(btr_cur))
-	      == thr_get_trx(thr)->id);
-	ut_ad(!rec_get_deleted_flag(btr_cur_get_rec(btr_cur),
-				    dict_table_is_comp(node->table)));
-#endif
+	/* We are about to remove an old, delete-marked version of the
+	record that may have been delete-marked by a different transaction
+	than the rolling-back one. */
+	ut_ad(rec_get_deleted_flag(btr_cur_get_rec(btr_cur),
+				   dict_table_is_comp(node->table)));
 
 	if (mode == BTR_MODIFY_LEAF) {
 		err = btr_cur_optimistic_delete(btr_cur, 0, mtr)

No bundle (reason: useless for push emails).