From 1425f183734cb1c4b4804d846618505a111b8dde Mon Sep 17 00:00:00 2001
From: "jonas@perch.ndb.mysql.com" <>
Date: Wed, 16 Aug 2006 11:05:02 +0200
Subject: [PATCH] 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 | 6 ++++++
 mysql-test/ndb/ndb_config_2_node.ini | 6 ++++++
 mysql-test/ndb/ndb_config_4_node.ini | 6 ++++++
 3 files changed, 18 insertions(+)

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