diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-16 14:26:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-16 14:26:42 +0200 |
| commit | ae3962d142547dbbfa5aa5435a5d3d7808c23ba9 (patch) | |
| tree | 621486916f3254cb3cadd9db0807dee047e869be | |
| parent | 90b1a5790545ad44f2081d5e4976bad80850ece9 (diff) | |
| parent | 97e83eae2d359466801ada81c99d617d82a0cd20 (diff) | |
| download | mariadb-git-ae3962d142547dbbfa5aa5435a5d3d7808c23ba9.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index 47ec1365cb8..e68544bdfe8 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -2546,7 +2546,15 @@ ibuf_get_merge_page_nos_func( } else { rec_page_no = ibuf_rec_get_page_no(mtr, rec); rec_space_id = ibuf_rec_get_space(mtr, 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 |