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

[marko.makela]

 3890 Marko Mäkelä	2012-05-29
      WL#6255 refactoring:
      
      row_ins_clust_index_entry_low(): Move the log_free_check() call
      to the callers, because during online table rebuild, the clustered index
      tree of the new copy of the table could be X-latched while calling
      this function.

    modified:
      storage/innobase/row/row0ins.cc
 3889 Marko Mäkelä	2012-05-29
      WL#6255 refactoring.
      
      row_upd_build_difference_binary(): Add the parameters offsets and no_sys.
      When applying logged rows in online table rebuild, we do need to include
      DB_TRX_ID and DB_ROLL_PTR in the update vector.

    modified:
      storage/innobase/include/row0upd.h
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0upd.cc
=== modified file 'storage/innobase/row/row0ins.cc'
--- a/storage/innobase/row/row0ins.cc	revid:marko.makela@strippedmlrhq5oq9aev
+++ b/storage/innobase/row/row0ins.cc	revid:marko.makela@stripped
@@ -2167,8 +2167,6 @@ row_ins_clust_index_entry_low(
 
 	ut_ad(dict_index_is_clust(index));
 
-	log_free_check();
-
 	mtr_start(&mtr);
 
 	cursor.thr = thr;
@@ -2539,6 +2537,8 @@ row_ins_clust_index_entry(
 
 	/* Try first optimistic descent to the B-tree */
 
+	log_free_check();
+
 	err = row_ins_clust_index_entry_low(0, BTR_MODIFY_LEAF, index, entry,
 					    n_ext, thr);
 	if (err != DB_FAIL) {
@@ -2548,6 +2548,8 @@ row_ins_clust_index_entry(
 
 	/* Try then pessimistic descent to the B-tree */
 
+	log_free_check();
+
 	return(row_ins_clust_index_entry_low(0, BTR_MODIFY_TREE, index, entry,
 					     n_ext, thr));
 }

No bundle (reason: useless for push emails).