diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:11:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:11:59 +0300 |
| commit | acc58fd83584c49049951a2c54c7f82a0c7ec412 (patch) | |
| tree | 67f46432ebc28c825b370f04c387a06b942cbbc6 /storage/innobase/include/mtr0mtr.h | |
| parent | 2cae58f8918f64c77227cfa07ab2fd24c3580f81 (diff) | |
| parent | ca9276e37ea29468406d5ec7c17d2ad5c032637f (diff) | |
| download | mariadb-git-acc58fd83584c49049951a2c54c7f82a0c7ec412.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/mtr0mtr.h')
| -rw-r--r-- | storage/innobase/include/mtr0mtr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index 074f55971b3..0380d280d56 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 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 @@ -307,7 +307,8 @@ struct mtr_t { ut_ad(space->purpose == FIL_TYPE_TEMPORARY || space->purpose == FIL_TYPE_IMPORT || space->purpose == FIL_TYPE_TABLESPACE); - x_lock(&space->latch, file, line); + memo_push(space, MTR_MEMO_SPACE_X_LOCK); + rw_lock_x_lock_inline(&space->latch, 0, file, line); } /** Release an object in the memo stack. |