diff options
author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-06 16:24:01 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-06 16:24:01 +0300 |
commit | 9d820f416b0ff8b8735468fff2344bf89d15d24f (patch) | |
tree | f37babbf22f413001ec55f3fd065aac6ebd77c75 | |
parent | ec8b38b7bd6762164c268f84489dc7ea538feb77 (diff) | |
download | mariadb-git-9d820f416b0ff8b8735468fff2344bf89d15d24f.tar.gz |
Non-functional change: Unbreak the Hot Backup build.
page_rec_write_field(): Omit the definition if UNIV_HOTBACKUP is defined.
-rw-r--r-- | storage/innobase/include/page0page.h | 4 | ||||
-rw-r--r-- | storage/innobase/include/page0page.ic | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h index fc082e9b189..7091d8c2707 100644 --- a/storage/innobase/include/page0page.h +++ b/storage/innobase/include/page0page.h @@ -618,6 +618,7 @@ rec_t* page_rec_find_owner_rec( /*====================*/ rec_t* rec); /*!< in: the physical record */ +#ifndef UNIV_HOTBACKUP /***********************************************************************//** Write a 32-bit field in a data dictionary record. */ UNIV_INLINE @@ -626,9 +627,10 @@ page_rec_write_field( /*=================*/ rec_t* rec, /*!< in/out: record to update */ ulint i, /*!< in: index of the field to update */ - ulint page_no,/*!< in: value to write */ + ulint val, /*!< in: value to write */ mtr_t* mtr) /*!< in/out: mini-transaction */ __attribute__((nonnull)); +#endif /* !UNIV_HOTBACKUP */ /************************************************************//** Returns the maximum combined size of records which can be inserted on top of record heap. diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index 75e562a158d..115cee64f8b 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -959,6 +959,7 @@ page_get_free_space_of_empty( - 2 * PAGE_DIR_SLOT_SIZE)); } +#ifndef UNIV_HOTBACKUP /***********************************************************************//** Write a 32-bit field in a data dictionary record. */ UNIV_INLINE @@ -979,6 +980,7 @@ page_rec_write_field( mlog_write_ulint(data, val, MLOG_4BYTES, mtr); } +#endif /* !UNIV_HOTBACKUP */ /************************************************************//** Each user record on a page, and also the deleted user records in the heap |