bzr push into mysql-trunk-wl6255 branch (marko.makela:3979 to 3980) WL#6255

[marko.makela]

 3980 Marko Mäkelä	2012-06-14
      WL#6255 rb:1105 Problem 18 ut_a(prebuilt->table->n_ref_count == 1)
      
      row_purge_record_func(): Even if the record cannot be purged,
      close the table handle.

    modified:
      storage/innobase/row/row0purge.cc
 3979 Marko Mäkelä	2012-06-14
      WL#6255 cleanup: Remove dict_table_is_online_rebuild().

    modified:
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/row/row0merge.cc
=== modified file 'storage/innobase/row/row0purge.cc'
--- a/storage/innobase/row/row0purge.cc	revid:marko.makela@stripped120614080906-o37cmni4v23mp05y
+++ b/storage/innobase/row/row0purge.cc	revid:marko.makela@stripped-ava4hhbwovnhrnx7
@@ -817,6 +817,7 @@ row_purge_record_func(
 					were updated */
 {
 	dict_index_t*	clust_index;
+	bool		purged		= true;
 
 	clust_index = dict_table_get_first_index(node->table);
 
@@ -834,7 +835,8 @@ row_purge_record_func(
 		/* fall through */
 	case TRX_UNDO_UPD_EXIST_REC:
 		if (!row_purge_upd_exist_or_extern(thr, node, undo_rec)) {
-			return(false);
+			purged = false;
+			break;
 		}
 		MONITOR_INC(MONITOR_N_UPD_EXIST_EXTERN);
 		break;
@@ -849,7 +851,7 @@ row_purge_record_func(
 		node->table = NULL;
 	}
 
-	return(true);
+	return(purged);
 }
 
 #ifdef UNIV_DEBUG

No bundle (reason: useless for push emails).