diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
| commit | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch) | |
| tree | 1972ed60ad937e632cf111e7beafb2148a87efeb /storage/xtradb/buf | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz | |
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0flu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/xtradb/buf/buf0flu.c b/storage/xtradb/buf/buf0flu.c index 752380d116c..3122cbabee7 100644 --- a/storage/xtradb/buf/buf0flu.c +++ b/storage/xtradb/buf/buf0flu.c @@ -1120,6 +1120,10 @@ retry_lock_1: /* Try to flush also all the neighbors */ page_count += buf_flush_try_neighbors( space, offset, flush_type, srv_flush_neighbor_pages); + mutex_t* block_mutex; + buf_page_t* bpage_tmp; + block_mutex = buf_page_get_mutex(bpage); + bpage_tmp = buf_page_hash_get(space, offset); /* fprintf(stderr, "Flush type %lu, page no %lu, neighb %lu\n", flush_type, offset, @@ -1234,7 +1238,8 @@ buf_flush_LRU_recommendation(void) + BUF_FLUSH_EXTRA_MARGIN) && (distance < BUF_LRU_FREE_SEARCH_LEN)) { - if (!bpage->in_LRU_list) { + mutex_t* block_mutex; + if (!bpage->in_LRU_list) { /* reatart. but it is very optimistic */ bpage = UT_LIST_GET_LAST(buf_pool->LRU); continue; |