diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 14:07:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 14:15:04 +0200 |
| commit | 878bc854d9d47e65a2618dedcc355d5e0a779cd5 (patch) | |
| tree | ae3aa7ccd04d2492368fcb909ad42a2a09b497b0 /storage | |
| parent | 33f74e8fcfbcfa1c817b2cc329ba3ffdcf2253d3 (diff) | |
| download | mariadb-git-878bc854d9d47e65a2618dedcc355d5e0a779cd5.tar.gz | |
MDEV-21024: Clean up dict_hdr_create()
The DICT_HDR_MAX_SPACE_ID was already zero-initialized at page allocation.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0boot.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc index 52c384f118d..58bcaf29f89 100644 --- a/storage/innobase/dict/dict0boot.cc +++ b/storage/innobase/dict/dict0boot.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, MariaDB Corporation. +Copyright (c) 2016, 2019, 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 @@ -197,8 +197,7 @@ dict_hdr_create( mlog_write_ull(dict_header + DICT_HDR_INDEX_ID, DICT_HDR_FIRST_ID, mtr); - mlog_write_ulint(dict_header + DICT_HDR_MAX_SPACE_ID, - 0, MLOG_4BYTES, mtr); + ut_ad(mach_read_from_4(dict_header + DICT_HDR_MAX_SPACE_ID) == 0); /* Obsolete, but we must initialize it anyway. */ mlog_write_ulint(dict_header + DICT_HDR_MIX_ID_LOW, |