mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a merge error introduced in:

Browse source 
revision-id: inaam.rana@oracle.com-20110617202919-b7p0u0ekj5a9u9nu
This commit is contained in:
Inaam Rana 2011-06-20 00:37:36 -04:00
parent 33f3864e62
commit 4b26365c1d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/buf/buf0buf.c
View file

@ -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;