|
1 | 1 | /*****************************************************************************
|
2 | 2 |
|
3 | 3 | Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
|
4 |
| -Copyright (c) 2017, 2021, MariaDB Corporation. |
| 4 | +Copyright (c) 2017, 2022, MariaDB Corporation. |
5 | 5 |
|
6 | 6 | This program is free software; you can redistribute it and/or modify it under
|
7 | 7 | the terms of the GNU General Public License as published by the Free Software
|
@@ -115,13 +115,9 @@ If same_page=1 is set in a record that follows a same_page=0 record
|
115 | 115 | in a mini-transaction, the tablespace identifier and page number
|
116 | 116 | fields will be omitted.
|
117 | 117 |
|
118 |
| -(For some file-oriented records (if same_page=1 for the first records |
119 |
| -of a mini-transaction), we will write tablespace identifier using the |
120 |
| -same 1-to-5-byte encoding. TBD: describe the exact format of |
121 |
| -file-oriented records. With MDEV-14425, we could write file-level log |
122 |
| -records to a separate file, not interleaved with page-level redo log |
123 |
| -at all. We could reserve the file ib_logfile0 for checkpoint information |
124 |
| -and for file-level redo log records.) |
| 118 | +For FILE_ records (if same_page=1 for the first record |
| 119 | +of a mini-transaction), we will write a tablespace identifier and |
| 120 | +a page number (always 0) using the same 1-to-5-byte encoding. |
125 | 121 |
|
126 | 122 | For FREE_PAGE or INIT_PAGE, if same_page=1, the record will be treated
|
127 | 123 | as corrupted (or reserved for future extension). The type code must
|
@@ -304,18 +300,14 @@ enum mfile_type_t
|
304 | 300 | FILE_RENAME = 0xa0,
|
305 | 301 | /** Modify a file. Followed by tablespace ID and the file name. */
|
306 | 302 | FILE_MODIFY = 0xb0,
|
307 |
| -#if 1 /* MDEV-14425 FIXME: Remove this! */ |
308 | 303 | /** End-of-checkpoint marker. Followed by 2 dummy bytes of page identifier,
|
309 | 304 | 8 bytes of LSN, and padded with a NUL; @see SIZE_OF_FILE_CHECKPOINT. */
|
310 | 305 | FILE_CHECKPOINT = 0xf0
|
311 |
| -#endif |
312 | 306 | };
|
313 | 307 |
|
314 |
| -#if 1 /* MDEV-14425 FIXME: Remove this! */ |
315 | 308 | /** Size of a FILE_CHECKPOINT record, including the trailing byte to
|
316 | 309 | terminate the mini-transaction. */
|
317 | 310 | constexpr byte SIZE_OF_FILE_CHECKPOINT= 3/*type,page_id*/ + 8/*LSN*/ + 1;
|
318 |
| -#endif |
319 | 311 |
|
320 | 312 | #ifndef UNIV_INNOCHECKSUM
|
321 | 313 | /** Types for the mlock objects to store in the mtr_t::m_memo */
|
|
0 commit comments