Commit 59eda73e authored by Marko Mäkelä's avatar Marko Mäkelä

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 fa1aef39
of MDEV-24340 (commit 1eb59c30).
parent c88fcf07
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2008, Google Inc. Copyright (c) 2008, Google Inc.
Copyright (c) 2009, Percona 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 Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
...@@ -2656,7 +2656,9 @@ void innodb_shutdown() ...@@ -2656,7 +2656,9 @@ void innodb_shutdown()
srv_sys_space.shutdown(); srv_sys_space.shutdown();
if (srv_tmp_space.get_sanity_check_status()) { 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.delete_files();
} }
srv_tmp_space.shutdown(); srv_tmp_space.shutdown();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment