diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-14 13:31:07 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-14 13:31:07 +0300 |
commit | c235295525e6dfd0f209e554c3a2baa1115d3879 (patch) | |
tree | cd690bc8cb3d2cac3e3dcf682e101e7adac18cfa /storage/innobase/include/dict0dict.h | |
parent | e87c710dfc802254a59fa1bb0f9f43afaf3ef301 (diff) | |
parent | 2aed566d2267a824158025c09830bc6353ec88a9 (diff) | |
download | mariadb-git-c235295525e6dfd0f209e554c3a2baa1115d3879.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/include/dict0dict.h')
-rw-r--r-- | storage/innobase/include/dict0dict.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 461b266f6fd..d127e7b770c 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -1351,7 +1351,7 @@ class dict_sys_t std::atomic<ulonglong> latch_ex_wait_start; /** the rw-latch protecting the data dictionary cache */ - MY_ALIGNED(CACHE_LINE_SIZE) srw_lock latch; + alignas(CPU_LEVEL1_DCACHE_LINESIZE) srw_lock latch; #ifdef UNIV_DEBUG /** whether latch is being held in exclusive mode (by any thread) */ bool latch_ex; |