Commit c75e8aa6 authored by Inaam Rana's avatar Inaam Rana

Fix a merge error introduced in:

revision-id: inaam.rana@oracle.com-20110617202919-b7p0u0ekj5a9u9nu
parent 9df4c143
......@@ -3232,9 +3232,6 @@ err_exit:
uninitialized data. */
data = buf_buddy_alloc(buf_pool, zip_size, &lru);
/* Initialize the buf_pool pointer. */
bpage->buf_pool_index = buf_pool_index(buf_pool);
/* If buf_buddy_alloc() allocated storage from the LRU list,
it released and reacquired buf_pool->mutex. Thus, we must
check the page_hash again, as it may have been modified. */
......@@ -3258,6 +3255,9 @@ err_exit:
bpage = buf_page_alloc_descriptor();
/* Initialize the buf_pool pointer. */
bpage->buf_pool_index = buf_pool_index(buf_pool);
page_zip_des_init(&bpage->zip);
page_zip_set_size(&bpage->zip, zip_size);
bpage->zip.data = data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment