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

MDEV-24751: member call on fil_system.temp_space in innodb_shutdown()

Browse Source 
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).
This commit is contained in:
Marko Mäkelä 2021-02-01 13:17:17 +02:00
parent c88fcf07d9
commit 59eda73eff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/srv/srv0start.cc
View File

@ -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()) {
if (fil_system.temp_space) {
fil_system.temp_space->close();
}
srv_tmp_space.delete_files();
}
srv_tmp_space.shutdown();