diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-12-12 13:53:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-12-12 13:53:18 +0200 |
| commit | 091a2e3b0b5ee83733858f9dded538d55a9ababa (patch) | |
| tree | 1c556ae74b0fc7fd35fd7f98e548331b3cee33f5 /storage | |
| parent | 7532976dd99ab89061d6f39910d25a760908c44b (diff) | |
| parent | 3d58fd6900128503d8516515496868c516ce63a0 (diff) | |
| download | mariadb-git-091a2e3b0b5ee83733858f9dded538d55a9ababa.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/page0page.h | 4 | ||||
| -rw-r--r-- | storage/innobase/page/page0page.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h index 6a82e820312..540ec7855bc 100644 --- a/storage/innobase/include/page0page.h +++ b/storage/innobase/include/page0page.h @@ -893,6 +893,7 @@ page_parse_create( ulint comp, /*!< in: nonzero=compact page format */ buf_block_t* block, /*!< in: block or NULL */ mtr_t* mtr); /*!< in: mtr or NULL */ +#ifndef UNIV_HOTBACKUP /************************************************************//** Prints record contents including the data relevant only in the index page context. */ @@ -902,6 +903,7 @@ page_rec_print( /*===========*/ const rec_t* rec, /*!< in: physical record */ const ulint* offsets);/*!< in: record descriptor */ +# ifdef UNIV_BTR_PRINT /***************************************************************//** This is used to print the contents of the directory for debugging purposes. */ @@ -941,6 +943,8 @@ page_print( in directory */ ulint rn); /*!< in: print rn first and last records in directory */ +# endif /* UNIV_BTR_PRINT */ +#endif /* !UNIV_HOTBACKUP */ /***************************************************************//** The following is used to validate a record on a page. This function differs from rec_validate as it can also check the n_owned field and diff --git a/storage/innobase/page/page0page.c b/storage/innobase/page/page0page.c index 102274d66f3..4858929082a 100644 --- a/storage/innobase/page/page0page.c +++ b/storage/innobase/page/page0page.c @@ -1591,13 +1591,14 @@ page_rec_print( " n_owned: %lu; heap_no: %lu; next rec: %lu\n", (ulong) rec_get_n_owned_old(rec), (ulong) rec_get_heap_no_old(rec), - (ulong) rec_get_next_offs(rec, TRUE)); + (ulong) rec_get_next_offs(rec, FALSE)); } page_rec_check(rec); rec_validate(rec, offsets); } +# ifdef UNIV_BTR_PRINT /***************************************************************//** This is used to print the contents of the directory for debugging purposes. */ @@ -1758,6 +1759,7 @@ page_print( page_dir_print(page, dn); page_print_list(block, index, rn); } +# endif /* UNIV_BTR_PRINT */ #endif /* !UNIV_HOTBACKUP */ /***************************************************************//** |