bzr commit into mysql-trunk-innodb branch (marko.makela:3080)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.5-innodb/ based on revid:marko.makela@strippedgh4my3fio0

 3080 Marko Mäkelä	2010-05-11
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3457
        revision-id: marko.makela@stripped104910-nim8kgguawpis7zo
        parent: [e-mail]-20100511104500-c6kzd0bg5s42p8e9
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:49:10 +0300
        message:
          btr_page_split_and_insert(): Add an assertion
          suggested by Sunny Bains when reviewing Bug #52964.

    modified:
      storage/innobase/btr/btr0btr.c
=== modified file 'storage/innobase/btr/btr0btr.c'
--- a/storage/innobase/btr/btr0btr.c	2010-05-04 13:47:47 +0000
+++ b/storage/innobase/btr/btr0btr.c	2010-05-11 15:42:44 +0000
@@ -2004,6 +2004,7 @@ func_start:
 			goto insert_empty;
 		}
 	} else if (UNIV_UNLIKELY(insert_left)) {
+		ut_a(n_iterations > 0);
 		first_rec = page_rec_get_next(page_get_infimum_rec(page));
 		move_limit = page_rec_get_next(btr_cur_get_rec(cursor));
 	} else {

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