List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 27 2010 7:45pm
Subject:bzr push into mysql-next-mr-innodb branch (marko.makela:3277 to 3278)
View as plain text  
 3278 Marko Mäkelä	2010-10-27 [merge]
      Merge mysql-trunk-innodb to mysql-next-mr-innodb.

    modified:
      storage/innobase/buf/buf0buf.c
 3277 Vasil Dimov	2010-10-27 [merge]
      Merge mysql-next-mr-innodb from bk-internal into my local repo

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c	revid:vasil.dimov@stripped97cap
+++ b/storage/innobase/buf/buf0buf.c	revid:marko.makela@stripped
@@ -1315,7 +1315,8 @@ buf_pool_init(
 	ulint		i;
 	const ulint	size	= total_size / n_instances;
 
-	ut_ad(n_instances < MAX_BUFFER_POOLS);
+	ut_ad(n_instances > 0);
+	ut_ad(n_instances <= MAX_BUFFER_POOLS);
 	ut_ad(n_instances == srv_buf_pool_instances);
 
 	/* We create an extra buffer pool instance, this instance is used

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101027194451-93lcsw5s9se1ynjv.bundle
Thread
bzr push into mysql-next-mr-innodb branch (marko.makela:3277 to 3278) marko.makela27 Oct