diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-18 16:19:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-18 16:19:39 +0300 |
| commit | 821e3d52c0e7405aea7054e138604ae1a4e8c921 (patch) | |
| tree | 1dbf11353bfd7ca04e176bc719e3dcec42eafe11 /storage/innobase/include/dict0mem.inl | |
| parent | 6c196090c8c265bfd93df1e2ee6b18cda2b1d2d8 (diff) | |
| download | mariadb-git-10.56-MDEV-30986.tar.gz | |
MDEV-30986 hybrid build with 10.6 InnoDB10.56-MDEV-30986
Diffstat (limited to 'storage/innobase/include/dict0mem.inl')
| -rw-r--r-- | storage/innobase/include/dict0mem.inl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/include/dict0mem.inl b/storage/innobase/include/dict0mem.inl index 0a554a54dbd..d60ee5d9bf4 100644 --- a/storage/innobase/include/dict0mem.inl +++ b/storage/innobase/include/dict0mem.inl @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2021, 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 @@ -64,10 +64,5 @@ dict_mem_fill_index_struct( /* The '1 +' above prevents allocation of an empty mem block */ index->nulls_equal = false; -#ifdef BTR_CUR_HASH_ADAPT -#ifdef MYSQL_INDEX_DISABLE_AHI - index->disable_ahi = false; -#endif -#endif /* BTR_CUR_HASH_ADAPT */ ut_d(index->magic_n = DICT_INDEX_MAGIC_N); } |