summaryrefslogtreecommitdiff
path: root/mysql-test/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-08-16 11:05:02 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-08-16 11:05:02 +0200
commitdbec402633a8d163ddf2c201d888277bb6398990 (patch)
tree2c48a1a36e13e0171c19e9f66ca7e3072718fcd4 /mysql-test/ndb
parent88166fe3226856a004d7c196f10b174df7208907 (diff)
downloadmariadb-git-dbec402633a8d163ddf2c201d888277bb6398990.tar.gz
ndb -
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell) This will hopefully remove some volatile testfailures in pushbuild (i've seen a couple by looking at logs) mysql-test/ndb/ndb_config_1_node.ini: Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell) mysql-test/ndb/ndb_config_2_node.ini: Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell) mysql-test/ndb/ndb_config_4_node.ini: Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
Diffstat (limited to 'mysql-test/ndb')
-rw-r--r--mysql-test/ndb/ndb_config_1_node.ini6
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini6
-rw-r--r--mysql-test/ndb/ndb_config_4_node.ini6
3 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index b5a765364bb..a03ca6f1e5e 100644
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -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
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index 26ed928a7cf..30956ea1323 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -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
diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini
index 89688666a35..78bf7a3a037 100644
--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -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