List:Commits« Previous MessageNext Message »
From:marko.makela Date:February 10 2011 12:19pm
Subject:bzr push into mysql-trunk-innodb branch (marko.makela:3493 to 3494)
View as plain text  
 3494 Marko Mäkelä	2011-02-10 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/buf/buf0rea.c
 3493 Vasil Dimov	2011-02-10 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb
      (ignoring the version bump in univ.i)

    modified:
      mysql-test/valgrind.supp
=== modified file 'storage/innobase/buf/buf0rea.c'
--- a/storage/innobase/buf/buf0rea.c	revid:vasil.dimov@strippedgwe60zw64ibhnc
+++ b/storage/innobase/buf/buf0rea.c	revid:marko.makela@stripped
@@ -535,7 +535,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/marko.makela@oracle.com-20110210121721-go9r88m00zup4uor.bundle
Thread
bzr push into mysql-trunk-innodb branch (marko.makela:3493 to 3494) marko.makela10 Feb