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/include | |
| 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/include')
| -rw-r--r-- | storage/innobase/include/page0zip.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h index 00c1d0516e6..9cf3b9805bc 100644 --- a/storage/innobase/include/page0zip.h +++ b/storage/innobase/include/page0zip.h @@ -156,9 +156,10 @@ page_zip_validate_low( /*==================*/ const page_zip_des_t* page_zip,/*!< in: compressed page */ const page_t* page, /*!< in: uncompressed page */ + const dict_index_t* index, /*!< in: index of the page, if known */ ibool sloppy) /*!< in: FALSE=strict, TRUE=ignore the MIN_REC_FLAG */ - __attribute__((nonnull)); + __attribute__((nonnull(1,2))); /**********************************************************************//** Check that the compressed and decompressed pages match. */ UNIV_INTERN @@ -166,8 +167,9 @@ ibool page_zip_validate( /*==============*/ const page_zip_des_t* page_zip,/*!< in: compressed page */ - const page_t* page) /*!< in: uncompressed page */ - __attribute__((nonnull)); + const page_t* page, /*!< in: uncompressed page */ + const dict_index_t* index) /*!< in: index of the page, if known */ + __attribute__((nonnull(1,2))); #endif /* UNIV_ZIP_DEBUG */ /**********************************************************************//** |