summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-06-04 22:07:13 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2020-06-04 22:07:13 +0200
commit036920c7262dfaf1532f3ba77a013b7ec04d5f7c (patch)
treeb9dd77aa2acea498dd26e60ef78884ffd335e161
parentea8951326b9c4f5203f0f37b574b8436b38d9300 (diff)
downloadmariadb-git-bb-10.5-MDEV-15053-3.tar.gz
Fix crash on Windowsbb-10.5-MDEV-15053-3
srv_thread_pool->disable_aio() followed by os_file_close() causes crash, even though it should be OK.
-rw-r--r--tpool/tpool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tpool/tpool.h b/tpool/tpool.h
index ae9baf236b0..239be53c27e 100644
--- a/tpool/tpool.h
+++ b/tpool/tpool.h
@@ -229,7 +229,7 @@ public:
m_aio.reset();
}
int bind(native_file_handle &fd) { return m_aio->bind(fd); }
- void unbind(const native_file_handle &fd) { m_aio->unbind(fd); }
+ void unbind(const native_file_handle &fd) { if (m_aio) m_aio->unbind(fd); }
int submit_io(aiocb *cb) { return m_aio->submit_io(cb); }
virtual void wait_begin() {};
virtual void wait_end() {};