bk commit into 5.1 tree (jonas:1.2272)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-16 11:05:02+02:00, jonas@stripped +3 -0
  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@stripped, 2006-08-16 11:05:00+02:00,
jonas@stripped +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several
tests in parallell)

  mysql-test/ndb/ndb_config_2_node.ini@stripped, 2006-08-16 11:05:00+02:00,
jonas@stripped +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several
tests in parallell)

  mysql-test/ndb/ndb_config_4_node.ini@stripped, 2006-08-16 11:05:00+02:00,
jonas@stripped +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several
tests in parallell)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.18/mysql-test/ndb/ndb_config_2_node.ini	2006-08-16 11:05:06 +02:00
+++ 1.19/mysql-test/ndb/ndb_config_2_node.ini	2006-08-16 11:05:06 +02:00
@@ -16,6 +16,12 @@
 # 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
 

--- 1.2/mysql-test/ndb/ndb_config_1_node.ini	2006-08-16 11:05:06 +02:00
+++ 1.3/mysql-test/ndb/ndb_config_1_node.ini	2006-08-16 11:05:06 +02:00
@@ -13,6 +13,12 @@
 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
 

--- 1.2/mysql-test/ndb/ndb_config_4_node.ini	2006-08-16 11:05:06 +02:00
+++ 1.3/mysql-test/ndb/ndb_config_4_node.ini	2006-08-16 11:05:06 +02:00
@@ -13,6 +13,12 @@
 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