bk commit into 5.1 tree (tomas:1.1985) BUG#16996

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1985 06/02/01 10:14:22 tomas@stripped +1 -0
  Bug #16996
  ndbd nodes crash at api heartbeat failure if event/replication is used

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.29 06/02/01 10:14:14 tomas@stripped +10 -2
    Bug #16996
    ndbd nodes crash at api heartbeat failure if event/replication is used

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.28/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-01-18 16:51:36 +01:00
+++ 1.29/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-02-01 10:14:14 +01:00
@@ -178,8 +178,16 @@
   c_subscriptionPool.setSize(noTables);
   c_syncPool.setSize(2);
   c_dataBufferPool.setSize(noAttrs);
-  c_gcp_pool.setSize(10);
-  
+
+  // Calculate needed gcp pool as 10 records + the ones needed
+  // during a possible api timeout
+  Uint32 dbApiHbInterval, gcpInterval;
+  ndb_mgm_get_int_parameter(p, CFG_DB_API_HEARTBEAT_INTERVAL,
+			    &dbApiHbInterval);
+  ndb_mgm_get_int_parameter(p, CFG_DB_GCP_INTERVAL,
+                            &gcpInterval);
+  c_gcp_pool.setSize(10 + (4*dbApiHbInterval)/gcpInterval);
+
   c_page_chunk_pool.setSize(50);
 
   {