diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-02-10 16:05:37 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-02-10 16:05:37 +0200 |
| commit | 41cd80fe065f3887db9f2d4f50729204ad13ba0f (patch) | |
| tree | 22061f15ca091eaf5413254ab6392fcbfb490c68 /storage/innobase/include | |
| parent | c2b217e2434e5a2903e85705f915f3c55ec2342c (diff) | |
| download | mariadb-git-41cd80fe065f3887db9f2d4f50729204ad13ba0f.tar.gz | |
After review fixes.
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 1 | ||||
| -rw-r--r-- | storage/innobase/include/fil0fil.ic | 37 |
2 files changed, 17 insertions, 21 deletions
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index a0109b4aa64..8568d8b04f2 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -1644,7 +1644,6 @@ struct buf_page_t{ unsigned key_version; /*!< key version for this block */ bool encrypted; /*!< page is still encrypted */ - bool corrupted; /*!< page is corrupted */ ulint real_size; /*!< Real size of the page Normal pages == UNIV_PAGE_SIZE diff --git a/storage/innobase/include/fil0fil.ic b/storage/innobase/include/fil0fil.ic index 772255bb75b..bea274d2c86 100644 --- a/storage/innobase/include/fil0fil.ic +++ b/storage/innobase/include/fil0fil.ic @@ -58,43 +58,40 @@ fil_get_page_type_name( { switch(page_type) { case FIL_PAGE_PAGE_COMPRESSED: - return (const char*)"PAGE_COMPRESSED"; + return "PAGE_COMPRESSED"; case FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED: - return (const char*)"PAGE_COMPRESSED_ENCRYPTED"; + return "PAGE_COMPRESSED_ENCRYPTED"; case FIL_PAGE_INDEX: - return (const char*)"INDEX"; + return "INDEX"; case FIL_PAGE_UNDO_LOG: - return (const char*)"UNDO LOG"; + return "UNDO LOG"; case FIL_PAGE_INODE: - return (const char*)"INODE"; + return "INODE"; case FIL_PAGE_IBUF_FREE_LIST: - return (const char*)"IBUF_FREE_LIST"; + return "IBUF_FREE_LIST"; case FIL_PAGE_TYPE_ALLOCATED: - return (const char*)"ALLOCATED"; + return "ALLOCATED"; case FIL_PAGE_IBUF_BITMAP: - return (const char*)"IBUF_BITMAP"; + return "IBUF_BITMAP"; case FIL_PAGE_TYPE_SYS: - return (const char*)"SYS"; + return "SYS"; case FIL_PAGE_TYPE_TRX_SYS: - return (const char*)"TRX_SYS"; + return "TRX_SYS"; case FIL_PAGE_TYPE_FSP_HDR: - return (const char*)"FSP_HDR"; + return "FSP_HDR"; case FIL_PAGE_TYPE_XDES: - return (const char*)"XDES"; + return "XDES"; case FIL_PAGE_TYPE_BLOB: - return (const char*)"BLOB"; + return "BLOB"; case FIL_PAGE_TYPE_ZBLOB: - return (const char*)"ZBLOB"; + return "ZBLOB"; case FIL_PAGE_TYPE_ZBLOB2: - return (const char*)"ZBLOB2"; + return "ZBLOB2"; case FIL_PAGE_TYPE_COMPRESSED: - return (const char*)"ORACLE PAGE COMPRESSED"; - - /* No default to make compiler generate warning if - new page type is added but not handled here. */ + return "ORACLE PAGE COMPRESSED"; } - return (const char*)"PAGE TYPE CORRUPTED"; + return "PAGE TYPE CORRUPTED"; } |