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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

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
 

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
 

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