increase heartbeat interval to avoid load related start up issues in mysql-test-run

1f6d0fd5 · tomas@whalegate.ndb.mysql.com · 5463f4bd · 1f6d0fd5 · 1f6d0fd5 · 1f6d0fd5
Commit 1f6d0fd5 authored May 08, 2007 by tomas@whalegate.ndb.mysql.com
Showing with 7 additions and 4 deletions

.bzrignore .bzrignore +1 -0

mysql-test/ndb/ndb_config_1_node.ini mysql-test/ndb/ndb_config_1_node.ini +3 -2

mysql-test/ndb/ndb_config_4_node.ini mysql-test/ndb/ndb_config_4_node.ini +3 -2

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -2989,3 +2989,4 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+libmysqld/ha_ndbcluster_cond.cc
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -11,12 +11,13 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
 MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
 TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
-DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
 #
-# Increase deadlock-timeout to cater for slow test-machines
+# Increase timeouts to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
 #TransactionDeadlockDetectionTimeout= 7500
 [ndbd]

--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -11,12 +11,13 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
 MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
 TimeBetweenGlobalCheckpoints= 500
 NoOfFragmentLogFiles= 3
-DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
 #
-# Increase deadlock-timeout to cater for slow test-machines
+# Increase timeouts to cater for slow test-machines
 #   (possibly running several tests in parallell)
 #
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
 #TransactionDeadlockDetectionTimeout= 7500
 [ndbd]