1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25998 fixup: Assert that a mutex is being held

Browse Source
This commit is contained in:
Marko Mäkelä 2021-07-27 09:26:24 +03:00
parent da094188f6
commit e11cae71fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/fil/fil0crypt.cc
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
Copyright (C) 2013, 2015, Google Inc. All Rights Reserved. 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 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 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); ut_ad(space.purpose == FIL_TYPE_TABLESPACE);
fil_space_crypt_t *crypt_data = space.crypt_data; 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; const ulong encrypt_tables= srv_encrypt_tables;
if (!crypt_data) if (!crypt_data)
return !encrypt_tables; return !encrypt_tables;