diff options
| author | Sergei Krivonos <name@localhost.localdomain> | 2021-10-18 22:02:34 +0300 |
|---|---|---|
| committer | Sergei Krivonos <name@localhost.localdomain> | 2021-10-19 13:57:22 +0300 |
| commit | e83a76a567fe6c5003048b6ac7385668890bdb5c (patch) | |
| tree | a21ae7eaa3fe9fd4aae733dd0d3e0a47081f080a | |
| parent | e7208bd93445ee233d72c8fd9413a4c83043b123 (diff) | |
| download | mariadb-git-e83a76a567fe6c5003048b6ac7385668890bdb5c.tar.gz | |
potential double log.close() call issue
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/include/log0log.h | 1 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index d49ad47d084..5cb0678bfbf 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -5947,7 +5947,6 @@ static bool xtrabackup_prepare_func(char** argv) os_event_destroy(srv_allow_writes_event); #endif innodb_free_param(); - log_sys.close(); sync_check_close(); if (!ok) goto error_cleanup; } diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h index 1dcff513d7c..e884378b3c2 100644 --- a/storage/innobase/include/log0log.h +++ b/storage/innobase/include/log0log.h @@ -635,6 +635,7 @@ public: uninitialised. Real initialisation happens in create(). */ log_t(): m_initialised(false) {} + ~log_t(){ close(); } /** @return whether the redo log is encrypted */ bool is_encrypted() const { return(log.is_encrypted()); } diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index aa6e7ce11f9..8fddca4f1fc 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2084,7 +2084,6 @@ void innodb_shutdown() } #endif /* BTR_CUR_HASH_ADAPT */ ibuf_close(); - log_sys.close(); purge_sys.close(); trx_sys.close(); buf_dblwr.close(); |