diff options
Diffstat (limited to 'storage/innobase/include/fil0fil.h')
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 9c453d3f4ca..c91e1777a13 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -66,11 +66,16 @@ of the address is FIL_NULL, the address is considered undefined. */ typedef byte fil_faddr_t; /*!< 'type' definition in C: an address stored in a file page is a string of bytes */ + +#endif /* !UNIV_INNOCHECKSUM */ + #define FIL_ADDR_PAGE 0 /* first in address is the page offset */ #define FIL_ADDR_BYTE 4 /* then comes 2-byte byte offset within page*/ #define FIL_ADDR_SIZE 6 /* address size is 6 bytes */ +#ifndef UNIV_INNOCHECKSUM + /** File space address */ struct fil_addr_t{ ulint page; /*!< page number within a space */ @@ -163,8 +168,6 @@ static const ulint FIL_PAGE_COMPRESS_SIZE_V1 = FIL_PAGE_ORIGINAL_SIZE_V1 + 2; #define FIL_PAGE_DATA_END 8 /*!< size of the page trailer */ /* @} */ -#ifndef UNIV_INNOCHECKSUM - /** File page types (values of FIL_PAGE_TYPE) @{ */ #define FIL_PAGE_PAGE_COMPRESSED 34354 /*!< page compressed page */ #define FIL_PAGE_INDEX 17855 /*!< B-tree node */ @@ -191,6 +194,8 @@ static const ulint FIL_PAGE_COMPRESS_SIZE_V1 = FIL_PAGE_ORIGINAL_SIZE_V1 + 2; #define FIL_LOG 502 /*!< redo log */ /* @} */ +#ifndef UNIV_INNOCHECKSUM + /** The number of fsyncs done to the log */ extern ulint fil_n_log_flushes; @@ -614,7 +619,8 @@ UNIV_INTERN ibool fil_inc_pending_ops( /*================*/ - ulint id); /*!< in: space id */ + ulint id, /*!< in: space id */ + ibool print_err); /*!< in: need to print error or not */ /*******************************************************************//** Decrements the count of pending operations. */ UNIV_INTERN |