diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-09-17 14:32:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-09-17 14:32:07 +0300 |
| commit | d7089f6f3e924a103d84b0d79de2ed9eb90ed87a (patch) | |
| tree | 04da0b90beffd0e80be13f687447de4b3c3772c8 /storage/innobase/ibuf | |
| parent | 8d5c44c9dd7c833c6abf37f753d1b64532af0459 (diff) | |
| parent | 300f3fb77f3cc402b454a5f35e56efcefa2e7fc2 (diff) | |
| download | mariadb-git-d7089f6f3e924a103d84b0d79de2ed9eb90ed87a.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index c7887afef92..69175553e66 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -4176,11 +4176,11 @@ ibuf_delete( page, 1); } #ifdef UNIV_ZIP_DEBUG - ut_a(!page_zip || page_zip_validate(page_zip, page)); + ut_a(!page_zip || page_zip_validate(page_zip, page, index)); #endif /* UNIV_ZIP_DEBUG */ page_cur_delete_rec(&page_cur, index, offsets, mtr); #ifdef UNIV_ZIP_DEBUG - ut_a(!page_zip || page_zip_validate(page_zip, page)); + ut_a(!page_zip || page_zip_validate(page_zip, page, index)); #endif /* UNIV_ZIP_DEBUG */ if (page_zip) { |