summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMySQL Build Team <build@mysql.com>2010-06-22 21:56:18 +0200
committerMySQL Build Team <build@mysql.com>2010-06-22 21:56:18 +0200
commite87a2d917b39043ce7124aae8788e8247e611211 (patch)
tree23efdab8c2919652ad7a9503dd146733f17f9195
parent1cab479221f6d9fbe0fc44414b5b6a9bc7c9f009 (diff)
downloadmariadb-git-e87a2d917b39043ce7124aae8788e8247e611211.tar.gz
Backport into build-201006221614-5.1.46sp1
> ------------------------------------------------------------ > revno: 3351.47.2 > revision-id: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo > parent: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: mysql-5.1-innodb2 > 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.
-rw-r--r--storage/innodb_plugin/btr/btr0btr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innodb_plugin/btr/btr0btr.c b/storage/innodb_plugin/btr/btr0btr.c
index 1d6b4f5a0e6..0fd209e0216 100644
--- a/storage/innodb_plugin/btr/btr0btr.c
+++ b/storage/innodb_plugin/btr/btr0btr.c
@@ -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 {