diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-06 18:24:51 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-06 18:24:51 +0200 |
| commit | d29ae4918e7062896d9a5f50a2bc2bbc5f0c6f06 (patch) | |
| tree | e6b5bfa6ab416bf84f4d296d6f3006feec3d40cd /storage/innobase/ibuf/ibuf0ibuf.c | |
| parent | 7f0f18cd6ecd5a40f45393bfcc678350855f1513 (diff) | |
| parent | 1c4fd3bb546a501fc95ca52def2c728681d62b28 (diff) | |
| download | mariadb-git-d29ae4918e7062896d9a5f50a2bc2bbc5f0c6f06.tar.gz | |
merged mysql-5.1->mysql-5.1-security
Diffstat (limited to 'storage/innobase/ibuf/ibuf0ibuf.c')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index 1406b2de4e9..476d78e79ba 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -2009,7 +2009,15 @@ ibuf_get_merge_page_nos( } else { rec_page_no = ibuf_rec_get_page_no(rec); rec_space_id = ibuf_rec_get_space(rec); - ut_ad(rec_page_no > IBUF_TREE_ROOT_PAGE_NO); + /* In the system tablespace, the smallest + possible secondary index leaf page number is + bigger than IBUF_TREE_ROOT_PAGE_NO (4). In + other tablespaces, the clustered index tree is + created at page 3, which makes page 4 the + smallest possible secondary index leaf page + (and that only after DROP INDEX). */ + ut_ad(rec_page_no + > IBUF_TREE_ROOT_PAGE_NO - (rec_space_id != 0)); } #ifdef UNIV_IBUF_DEBUG |