bzr commit into mysql-5.5 branch (inaam.rana:3464)

[Inaam Rana]

#At file:///home/inaam/w/mysql-5.5/ based on revid:inaam.rana@stripped

 3464 Inaam Rana	2011-06-20
      Fix a merge error introduced in:
      revision-id: inaam.rana@stripped

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c	revid:inaam.rana@stripped
+++ b/storage/innobase/buf/buf0buf.c	revid:inaam.rana@stripped
@@ -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;


Attachment: [text/bzr-bundle] bzr/[e-mail]