diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 16:00:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 16:00:49 +0300 |
| commit | 09177eadc39ae1e777ad473970456cb9dd9c3993 (patch) | |
| tree | c680c8c15e5f0d3e465e12b59f3a13d23ad5be3f | |
| parent | ea1fbd0326f7df830896e10f5a469de78e278307 (diff) | |
| download | mariadb-git-09177eadc39ae1e777ad473970456cb9dd9c3993.tar.gz | |
MDEV-25257 follow-up: full_crc32 format is garbage-free
In any files that were created in the
innodb_checksum_algorithm=full_crc32 format
(commit c0f47a4a58424c621204dacb8016a94b66cb2bce)
any unused data fields will have been zero-initialized
(commit 3926673ce7149aa223103126b6aeac819b10fab5).
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index bfef508c613..a8972bab234 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2021, MariaDB Corporation. +Copyright (c) 2016, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1304,7 +1304,8 @@ dict_sys_tables_rec_read( high bit set in n_cols, and flags would be zero. MySQL 4.1 was the first version to support innodb_file_per_table, that is, *space_id != 0. */ - if (not_redundant || *space_id != 0 || *n_cols & DICT_N_COLS_COMPACT) { + if (not_redundant || *space_id != 0 || *n_cols & DICT_N_COLS_COMPACT + || fil_system.sys_space->full_crc32()) { /* Get flags2 from SYS_TABLES.MIX_LEN */ field = rec_get_nth_field_old( |