List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 27 2010 6:54pm
Subject:bzr push into mysql-5.5-innodb branch (marko.makela:3208 to 3209) Bug#57707
View as plain text  
 3209 Marko Mäkelä	2010-10-27
      Fix a bogus debug assertion in the fix of Bug #57707.
      
      buf_pool_init(): Replace ut_ad(n_instances < MAX_BUFFER_POOLS)
      with ut_ad(n_instances <= MAX_BUFFER_POOLS).
      (Spotted by Michael Izioumtchenko.)
      Add ut_ad(n_instances > 0).

    modified:
      storage/innobase/buf/buf0buf.c
 3208 Vasil Dimov	2010-10-27 [merge]
      Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty diff)

=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c	revid:vasil.dimov@stripped27134329-m33xa81pu6oph8ru
+++ b/storage/innobase/buf/buf0buf.c	revid:marko.makela@stripped1mxc3a602h
@@ -1295,7 +1295,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-20101027185045-uec2xx1mxc3a602h.bundle
Thread
bzr push into mysql-5.5-innodb branch (marko.makela:3208 to 3209) Bug#57707marko.makela27 Oct