summaryrefslogtreecommitdiff
path: root/mysql-test/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-08-21 07:53:27 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-08-21 07:53:27 +0200
commit6576b0e485413cbbb607244be46263de7c205c64 (patch)
tree7c07aaf53abfcd1ed57a515c55fabc2001f913ce /mysql-test/ndb
parent084e4231adac6b6c49ec0933635ecd86a286296e (diff)
downloadmariadb-git-6576b0e485413cbbb607244be46263de7c205c64.tar.gz
ndb - revert timeout changes, as a test depends on it, it mysterious ways
(mysql-test-run only) mysql-test/ndb/ndb_config_1_node.ini: revert timeout changes, as a test depends on it, it mysterious ways mysql-test/ndb/ndb_config_2_node.ini: revert timeout changes, as a test depends on it, it mysterious ways mysql-test/ndb/ndb_config_4_node.ini: revert timeout changes, as a test depends on it, it mysterious ways mysql-test/t/rpl_ndb_basic.test: revert timeout changes, as a test depends on it, it mysterious ways
Diffstat (limited to 'mysql-test/ndb')
-rw-r--r--mysql-test/ndb/ndb_config_1_node.ini2
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini2
-rw-r--r--mysql-test/ndb/ndb_config_4_node.ini2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini
index a03ca6f1e5e..39e758493c8 100644
--- a/mysql-test/ndb/ndb_config_1_node.ini
+++ b/mysql-test/ndb/ndb_config_1_node.ini
@@ -17,7 +17,7 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
-TransactionDeadlockDetectionTimeout= 7500
+#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 30956ea1323..99f31150d8c 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -20,7 +20,7 @@ InitialNoOfOpenFiles= 27
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
-TransactionDeadlockDetectionTimeout= 7500
+#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 78bf7a3a037..94d58bd8efc 100644
--- a/mysql-test/ndb/ndb_config_4_node.ini
+++ b/mysql-test/ndb/ndb_config_4_node.ini
@@ -17,7 +17,7 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
# Increase deadlock-timeout to cater for slow test-machines
# (possibly running several tests in parallell)
#
-TransactionDeadlockDetectionTimeout= 7500
+#TransactionDeadlockDetectionTimeout= 7500
[ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress