bzr push into mysql-trunk-innodb branch (marko.makela:3594 to 3595)

[marko.makela]

 3595 Marko Mäkelä	2011-04-20 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/btr/btr0cur.c
 3594 Marko Mäkelä	2011-04-20 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
=== modified file 'storage/innobase/btr/btr0cur.c'
--- a/storage/innobase/btr/btr0cur.c	revid:[e-mail]-20110420071304-i7b6a1q05mw43n3z
+++ b/storage/innobase/btr/btr0cur.c	revid:marko.makela@stripped420083348-79im2vuncn3qd7u0
@@ -2429,8 +2429,8 @@ make_external:
 	record on its page? */
 	was_first = page_cur_is_before_first(page_cursor);
 
-	/* The first parameter means that no lock checking and undo logging
-	is made in the insert */
+	/* Lock checks and undo logging were already performed by
+	btr_cur_upd_lock_and_undo(). */
 
 	err = btr_cur_pessimistic_insert(BTR_NO_UNDO_LOG_FLAG
 					 | BTR_NO_LOCKING_FLAG

Attachment: [text/bzr-bundle] bzr/[e-mail]