Skip to content

Commit 59eda73

Browse files
committed
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 fa1aef3 of MDEV-24340 (commit 1eb59c3).
1 parent c88fcf0 commit 59eda73

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

storage/innobase/srv/srv0start.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
44
Copyright (c) 2008, Google Inc.
55
Copyright (c) 2009, Percona Inc.
6-
Copyright (c) 2013, 2020, MariaDB Corporation.
6+
Copyright (c) 2013, 2021, MariaDB Corporation.
77
88
Portions of this file contain modifications contributed and copyrighted by
99
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -2656,7 +2656,9 @@ void innodb_shutdown()
26562656

26572657
srv_sys_space.shutdown();
26582658
if (srv_tmp_space.get_sanity_check_status()) {
2659-
fil_system.temp_space->close();
2659+
if (fil_system.temp_space) {
2660+
fil_system.temp_space->close();
2661+
}
26602662
srv_tmp_space.delete_files();
26612663
}
26622664
srv_tmp_space.shutdown();

0 commit comments

Comments
 (0)