summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorYasufumi Kinoshita <yasufumi.kinoshita@oracle.com>2012-10-17 15:28:31 +0900
committerYasufumi Kinoshita <yasufumi.kinoshita@oracle.com>2012-10-17 15:28:31 +0900
commit39e6eafc208476b15e134aa3c31dd11af512a146 (patch)
tree0710bbf24daefb32ce2f6e1dc328823be302e02b /storage
parentbdb4104cf6b658b0b614f2b5b3c690535fde3726 (diff)
downloadmariadb-git-39e6eafc208476b15e134aa3c31dd11af512a146.tar.gz
Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90S
rb://1334 approved by: Inaam Rana
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/buf/buf0buf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
index 3ec9ba246d2..b49f5288681 100644
--- a/storage/innodb_plugin/buf/buf0buf.c
+++ b/storage/innodb_plugin/buf/buf0buf.c
@@ -241,7 +241,7 @@ the read requests for the whole area.
#ifndef UNIV_HOTBACKUP
/** Value in microseconds */
-static const int WAIT_FOR_READ = 5000;
+static const int WAIT_FOR_READ = 100;
/** Number of attemtps made to read in a page in the buffer pool */
static const ulint BUF_PAGE_READ_MAX_RETRIES = 100;
@@ -1897,8 +1897,9 @@ wait_until_unfixed:
mutex_exit(&block->mutex);
if (io_fix == BUF_IO_READ) {
-
- os_thread_sleep(WAIT_FOR_READ);
+ /* wait by temporaly s-latch */
+ rw_lock_s_lock(&(block->lock));
+ rw_lock_s_unlock(&(block->lock));
} else {
break;
}