bzr push into mysql-trunk branch (marko.makela:3641 to 3642)

[marko.makela]

 3642 Marko Mäkelä	2011-11-22 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/include/btr0cur.h
 3641 Sneha Modi	2011-11-22 [merge]
      Null merge of fix for Bug#11748731 from mysql-5.5 -> mysql-trunk

=== modified file 'storage/innobase/btr/btr0cur.cc'
--- a/storage/innobase/btr/btr0cur.cc	revid:sneha.modi@stripped0111122105711-um8w96nmle4qqwx5
+++ b/storage/innobase/btr/btr0cur.cc	revid:marko.makela@strippedtz4vq0ge333th4bg
@@ -463,8 +463,6 @@ btr_cur_search_to_nth_level(
 	cursor->flag = BTR_CUR_BINARY;
 	cursor->index = index;
 
-	cursor->ibuf_cnt = ULINT_UNDEFINED;
-
 #ifndef BTR_CUR_ADAPT
 	guess = NULL;
 #else
@@ -752,21 +750,8 @@ retry_page_get:
 			/* We're doing a search on an ibuf tree and we're one
 			level above the leaf page. */
 
-			ulint	is_min_rec;
-
 			ut_ad(level == 0);
 
-			is_min_rec = rec_get_info_bits(node_ptr, 0)
-				& REC_INFO_MIN_REC_FLAG;
-
-			if (!is_min_rec) {
-				cursor->ibuf_cnt
-					= ibuf_rec_get_counter(node_ptr);
-
-				ut_a(cursor->ibuf_cnt <= 0xFFFF
-				     || cursor->ibuf_cnt == ULINT_UNDEFINED);
-			}
-
 			buf_mode = BUF_GET;
 			rw_latch = RW_NO_LATCH;
 			goto retry_page_get;

=== modified file 'storage/innobase/include/btr0cur.h'
--- a/storage/innobase/include/btr0cur.h	revid:sneha.modi@strippedm-20111122105711-um8w96nmle4qqwx5
+++ b/storage/innobase/include/btr0cur.h	revid:marko.makela@stripped12145-tz4vq0ge333th4bg
@@ -774,24 +774,6 @@ struct btr_cur_struct {
 					NULL */
 	ulint		fold;		/*!< fold value used in the search if
 					flag is BTR_CUR_HASH */
-	/*----- Delete buffering -------*/
-	ulint		ibuf_cnt;	/* in searches done on insert buffer
-					trees, this contains the "counter"
-					value (the first two bytes of the
-					fourth field) extracted from the
-					page above the leaf page, from the
-					father node pointer that pointed to
-					the leaf page. in other words, it
-					contains the minimum counter value
-					for records to be inserted on the
-					chosen leaf page. If for some reason
-					this can't be read, or if the search
-					ended on the leftmost leaf page in
-					the tree (in which case the father
-					node pointer had the 'minimum
-					record' flag set), this is
-					ULINT_UNDEFINED. */
-	/*------------------------------*/
 	/* @} */
 	btr_path_t*	path_arr;	/*!< in estimating the number of
 					rows in range, we store in this array

No bundle (reason: useless for push emails).