Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-08-16 11:06:56 +02:00
commit a13d114d02
3 changed files with 18 additions and 0 deletions

View file

@ -13,6 +13,12 @@ TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
#
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
TransactionDeadlockDetectionTimeout= 7500
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress

View file

@ -16,6 +16,12 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
# test that the parameter exists
InitialNoOfOpenFiles= 27
#
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
TransactionDeadlockDetectionTimeout= 7500
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress

View file

@ -13,6 +13,12 @@ TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3
DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
#
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
TransactionDeadlockDetectionTimeout= 7500
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress