diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-08 14:12:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-08 14:12:59 +0200 |
| commit | 06b0623adb71f2b7918f69ab68660ec45736ebb5 (patch) | |
| tree | 4ffb56ff961a962ff1831f5c5ddb0286d2305382 /storage/innobase/ha | |
| parent | c5856b0a68165952e4781cdccc7849c717a16980 (diff) | |
| download | mariadb-git-06b0623adb71f2b7918f69ab68660ec45736ebb5.tar.gz | |
Cleanup: Aligned InnoDB index page header access
ut_align_down(): Preserve the const qualifier. Use C++ casts.
ha_delete_hash_node(): Correct an assertion expression.
fil_page_get_type(): Perform an assumed-aligned read.
page_align(): Preserve the const qualifier. Assume (some) alignment.
page_get_max_trx_id(): Check the index page type.
page_header_get_field(): Perform an assumed-aligned read.
page_get_autoinc(): Perform an assumed-aligned read.
page_dir_get_nth_slot(): Perform an assumed-aligned read.
Preserve the const qualifier.
Diffstat (limited to 'storage/innobase/ha')
| -rw-r--r-- | storage/innobase/ha/ha0ha.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ha/ha0ha.cc b/storage/innobase/ha/ha0ha.cc index 8e8a3369b7c..ef4ca0cba16 100644 --- a/storage/innobase/ha/ha0ha.cc +++ b/storage/innobase/ha/ha0ha.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2020, 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 @@ -337,7 +337,7 @@ ha_delete_hash_node( ut_ad(btr_search_enabled); #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG if (table->adaptive) { - ut_a(del_node->block->frame = page_align(del_node->data)); + ut_a(del_node->block->frame == page_align(del_node->data)); ut_a(del_node->block->n_pointers-- < MAX_N_POINTERS); } #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ |