diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
| commit | cd694d76ce8dfcf22c685000b40fd90eae58e396 (patch) | |
| tree | b9800bec3859b0eff3c224b68258216b068e689e /storage/innobase/include | |
| parent | 17589989eec9cf4e9f7084505710a42929efe115 (diff) | |
| parent | 6b45355e6bd70e77fcd4dd4d0ef74608bafc9b02 (diff) | |
| download | mariadb-git-cd694d76ce8dfcf22c685000b40fd90eae58e396.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/btr0btr.ic | 2 | ||||
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 20 | ||||
| -rw-r--r-- | storage/innobase/include/page0page.ic | 2 |
3 files changed, 6 insertions, 18 deletions
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index 98fa765c0b5..57fccede952 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -306,7 +306,7 @@ btr_node_ptr_get_child_page_no( "InnoDB: a nonsensical page number 0" " in a node ptr record at offset %lu\n", (ulong) page_offset(rec)); - buf_page_print(page_align(rec), 0, 0); + buf_page_print(page_align(rec), 0); ut_ad(0); } diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 5fd3e05370f..002e562f283 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -773,25 +773,13 @@ buf_print(void); /*============*/ #endif /* UNIV_DEBUG_PRINT || UNIV_DEBUG || UNIV_BUF_DEBUG */ #endif /* !UNIV_HOTBACKUP */ -enum buf_page_print_flags { - /** Do not crash at the end of buf_page_print(). */ - BUF_PAGE_PRINT_NO_CRASH = 1, - /** Do not print the full page dump. */ - BUF_PAGE_PRINT_NO_FULL = 2 -}; -/********************************************************************//** -Prints a page to stderr. */ +/** Dump a page to stderr. +@param[in] read_buf database page +@param[in] zip_size compressed page size, or 0 for uncompressed */ UNIV_INTERN void -buf_page_print( -/*===========*/ - const byte* read_buf, /*!< in: a database page */ - ulint zip_size, /*!< in: compressed page size, or - 0 for uncompressed pages */ - ulint flags) /*!< in: 0 or - BUF_PAGE_PRINT_NO_CRASH or - BUF_PAGE_PRINT_NO_FULL */ +buf_page_print(const byte* read_buf, ulint zip_size) UNIV_COLD MY_ATTRIBUTE((nonnull)); /********************************************************************//** Decompress a block. diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index c5775188bcf..7a1a3be91ec 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -772,7 +772,7 @@ page_rec_get_next_low( (void*) rec, (ulong) page_get_space_id(page), (ulong) page_get_page_no(page)); - buf_page_print(page, 0, 0); + buf_page_print(page, 0); ut_error; } else if (offs == 0) { |