diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-01 13:17:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-01 13:17:17 +0200 |
| commit | 59eda73eff1a22ac0373d818bc802c05e82b5449 (patch) | |
| tree | 20e22c7101e0ccf3ff18cbc8ba587db9dedcc573 | |
| parent | c88fcf07d9f9478166f1fc981286f6e758668fea (diff) | |
| download | mariadb-git-59eda73eff1a22ac0373d818bc802c05e82b5449.tar.gz | |
MDEV-24751: member call on fil_system.temp_space in innodb_shutdown()
innodb_shutdown(): Check that fil_system.temp_space is not null
before invoking a member function.
This regression was caused by the merge
commit fa1aef39ebc7d84d24d4e3d2124f982526632ee9
of MDEV-24340 (commit 1eb59c307de163b507efade1fc372d8ff2bb94b7).
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index f7ea8c985f6..dc5eee0793b 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -3,7 +3,7 @@ Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2008, Google Inc. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2020, MariaDB Corporation. +Copyright (c) 2013, 2021, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -2656,7 +2656,9 @@ void innodb_shutdown() srv_sys_space.shutdown(); if (srv_tmp_space.get_sanity_check_status()) { - fil_system.temp_space->close(); + if (fil_system.temp_space) { + fil_system.temp_space->close(); + } srv_tmp_space.delete_files(); } srv_tmp_space.shutdown(); |