From e11cae71feb853dc6f2917a2b7ad2f41b294a9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 27 Jul 2021 09:26:24 +0300 Subject: [PATCH] MDEV-25998 fixup: Assert that a mutex is being held --- storage/innobase/fil/fil0crypt.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 4e710b4bb4f..310693dd02f 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -1,6 +1,6 @@ /***************************************************************************** Copyright (C) 2013, 2015, Google Inc. All Rights Reserved. -Copyright (c) 2014, 2020, MariaDB Corporation. +Copyright (c) 2014, 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 @@ -1103,7 +1103,7 @@ static bool fil_crypt_must_remove(const fil_space_t &space) { ut_ad(space.purpose == FIL_TYPE_TABLESPACE); fil_space_crypt_t *crypt_data = space.crypt_data; - mutex_own(&fil_system->mutex); + ut_ad(mutex_own(&fil_system->mutex)); const ulong encrypt_tables= srv_encrypt_tables; if (!crypt_data) return !encrypt_tables;