bzr push into mysql-5.5-innodb branch (marko.makela:3316 to 3317) Bug#59877

[marko.makela]

 3317 Marko Mäkelä	2011-02-10
      Bug #59877 Wrong buffer pool selected in buf_read_ibuf_merge_pages()

    modified:
      storage/innobase/buf/buf0rea.c
 3316 Vasil Dimov	2011-02-10 [merge]
      Null merge mysql-5.1-innodb -> mysql-5.5-innodb

=== modified file 'storage/innobase/buf/buf0rea.c'
--- a/storage/innobase/buf/buf0rea.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/buf/buf0rea.c	revid:[e-mail]-20110210120758-k3te77eu4shqcs3j
@@ -530,7 +530,7 @@ buf_read_ibuf_merge_pages(
 		buf_pool_t*	buf_pool;
 		ulint		zip_size = fil_space_get_zip_size(space_ids[i]);
 
-		buf_pool = buf_pool_get(space_ids[i], space_versions[i]);
+		buf_pool = buf_pool_get(space_ids[i], page_nos[i]);
 
 		while (buf_pool->n_pend_reads
 		       > buf_pool->curr_size / BUF_READ_AHEAD_PEND_LIMIT) {

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