1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Marko Mäkelä 2011-12-12 13:53:18 +02:00
commit 1ef5e39e0b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/include/page0page.h
View File

@ -893,6 +893,7 @@ page_parse_create(
ulint comp, /*!< in: nonzero=compact page format */ ulint comp, /*!< in: nonzero=compact page format */
buf_block_t* block, /*!< in: block or NULL */ buf_block_t* block, /*!< in: block or NULL */
mtr_t* mtr); /*!< in: mtr or NULL */ mtr_t* mtr); /*!< in: mtr or NULL */
#ifndef UNIV_HOTBACKUP
/************************************************************//** /************************************************************//**
Prints record contents including the data relevant only in Prints record contents including the data relevant only in
the index page context. */ the index page context. */
@ -902,6 +903,7 @@ page_rec_print(
/*===========*/ /*===========*/
const rec_t* rec, /*!< in: physical record */ const rec_t* rec, /*!< in: physical record */
const ulint* offsets);/*!< in: record descriptor */ const ulint* offsets);/*!< in: record descriptor */
# ifdef UNIV_BTR_PRINT
/***************************************************************//** /***************************************************************//**
This is used to print the contents of the directory for This is used to print the contents of the directory for
debugging purposes. */ debugging purposes. */
@ -941,6 +943,8 @@ page_print(
in directory */ in directory */
ulint rn); /*!< in: print rn first and last records ulint rn); /*!< in: print rn first and last records
in directory */ in directory */
# endif /* UNIV_BTR_PRINT */
#endif /* !UNIV_HOTBACKUP */
/***************************************************************//** /***************************************************************//**
The following is used to validate a record on a page. This function 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 differs from rec_validate as it can also check the n_owned field and

4
storage/innobase/page/page0page.c
View File

@ -1591,13 +1591,14 @@ page_rec_print(
" n_owned: %lu; heap_no: %lu; next rec: %lu\n", " n_owned: %lu; heap_no: %lu; next rec: %lu\n",
(ulong) rec_get_n_owned_old(rec), (ulong) rec_get_n_owned_old(rec),
(ulong) rec_get_heap_no_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); page_rec_check(rec);
rec_validate(rec, offsets); rec_validate(rec, offsets);
} }
# ifdef UNIV_BTR_PRINT
/***************************************************************//** /***************************************************************//**
This is used to print the contents of the directory for This is used to print the contents of the directory for
debugging purposes. */ debugging purposes. */
@ -1758,6 +1759,7 @@ page_print(
page_dir_print(page, dn); page_dir_print(page, dn);
page_print_list(block, index, rn); page_print_list(block, index, rn);
} }
# endif /* UNIV_BTR_PRINT */
#endif /* !UNIV_HOTBACKUP */ #endif /* !UNIV_HOTBACKUP */
/***************************************************************//** /***************************************************************//**