branches/innodb+: Merge revisions 3575:3579 from branches/zip:

  ------------------------------------------------------------------------
  r3577 | vasil | 2008-12-17 14:58:26 +0200 (Wed, 17 Dec 2008) | 6 lines

  branches/zip:

  Remove 2 entries from the ChangeLog about changes not big enough.

  Discussed with: Marko
  ------------------------------------------------------------------------
  r3579 | marko | 2008-12-17 22:40:38 +0200 (Wed, 17 Dec 2008) | 3 lines

  branches/zip: row_sel_try_search_shortcut(), row_sel(): Adjust two
  debug assertions that should have been adjusted in r3575.
  ------------------------------------------------------------------------

ChangeLog

@@ -64,16 +64,6 @@
 	erratic.  The fix is not to use srv_thread_concurrency when
 	exiting, instead use the flag trx->declared_to_be_inside_innodb.
 
-2008-12-09	The InnoDB Team
-
-	* trx/trx0undo.c:
-	Print 2 spaces between a timestamp and "InnoDB:" as usual.
-
-2008-12-09	The InnoDB Team
-
-	* row/row0purge.c:
-	Allocate mtr_vers from the stack, not with mem_alloc().
-
 2008-12-04	The InnoDB Team
 
 	* include/mysql_addons.h, handler/mysql_addons.cc,

row/row0sel.c

@@ -1229,7 +1229,7 @@ row_sel_try_search_shortcut(
 		goto func_exit;
 	}
 
-	ut_ad(plan->pcur.latch_mode == node->latch_mode);
+	ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
 
 	plan->n_rows_fetched++;
 	ret = SEL_FOUND;
@@ -1729,7 +1729,7 @@ row_sel(
 
 	plan->n_rows_fetched++;
 
-	ut_ad(plan->pcur.latch_mode == node->latch_mode);
+	ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
 
 	if ((plan->n_rows_fetched <= SEL_PREFETCH_LIMIT)
 	    || plan->unique_search || plan->no_prefetch