summaryrefslogtreecommitdiff
path: root/storage/xtradb/fil
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-10-09 17:20:49 +0200
committerSergei Golubchik <serg@mariadb.org>2015-10-09 17:20:49 +0200
commit6a821d78a6a33aaf81909ab2858d13f95dbe2708 (patch)
treed85ed04eed6ca75e9d8fc4b9d91b5f37773bf033 /storage/xtradb/fil
parent0b3eb4559bdb3c91b536c9fa56aa6b8931a3799b (diff)
downloadmariadb-git-6a821d78a6a33aaf81909ab2858d13f95dbe2708.tar.gz
5.6.26-74.0
Diffstat (limited to 'storage/xtradb/fil')
-rw-r--r--storage/xtradb/fil/fil0fil.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
index 1a23d844522..8c27affc4ac 100644
--- a/storage/xtradb/fil/fil0fil.cc
+++ b/storage/xtradb/fil/fil0fil.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -5630,9 +5630,10 @@ _fil_io(
space = fil_space_get_by_id(space_id);
- /* If we are deleting a tablespace we don't allow any read
- operations on that. However, we do allow write operations. */
- if (space == 0 || (type == OS_FILE_READ && space->stop_new_ops)) {
+ /* If we are deleting a tablespace we don't allow async read operations
+ on that. However, we do allow write and sync read operations */
+ if (space == 0
+ || (type == OS_FILE_READ && !sync && space->stop_new_ops)) {
mutex_exit(&fil_system->mutex);
ib_logf(IB_LOG_LEVEL_ERROR,