Commit 5463f4bd authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents fce52b20 482e56f1
...@@ -17,9 +17,11 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory ...@@ -17,9 +17,11 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
InitialNoOfOpenFiles= 27 InitialNoOfOpenFiles= 27
# #
# Increase deadlock-timeout to cater for slow test-machines # Increase timeouts to cater for slow test-machines
# (possibly running several tests in parallell) # (possibly running several tests in parallell)
# #
HeartbeatIntervalDbDb= 30000
HeartbeatIntervalDbApi= 30000
#TransactionDeadlockDetectionTimeout= 7500 #TransactionDeadlockDetectionTimeout= 7500
[ndbd] [ndbd]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment