diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-15 19:28:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-15 19:28:02 +0200 |
| commit | 8251a9fb93075a72074bd7fd10faee5165014b7f (patch) | |
| tree | 014fa738d387ffa3fe5f6d66c8645437ca87fce5 | |
| parent | f1beeb58e6cfaf38753bcd0a39f360cc19212309 (diff) | |
| download | mariadb-git-8251a9fb93075a72074bd7fd10faee5165014b7f.tar.gz | |
MDEV-27848 fixup: Use os_file_close_func()
To close a non-instrumented file, os_file_close_func() should be used
instead of os_file_close().
| -rw-r--r-- | storage/innobase/log/log0log.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index d07e0ff1f7a..b7254ef2baa 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -146,7 +146,7 @@ dberr_t log_file_t::close() noexcept { ut_a(is_opened()); - if (!os_file_close(m_file)) + if (!os_file_close_func(m_file)) return DB_ERROR; m_file= OS_FILE_CLOSED; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index ca3f4f68662..f915fb09769 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -216,7 +216,7 @@ err_exit: ret = os_file_set_size(logfile0.c_str(), file, srv_log_file_size); if (!ret) { - os_file_close(file); + os_file_close_func(file); ib::error() << "Cannot set log file " << logfile0 << " size to " << ib::bytes_iec{srv_log_file_size}; goto err_exit; |