bk commit into 5.1 tree (jonas:1.2283)

[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-21 07:53:27+02:00, jonas@stripped +4 -0
  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@stripped, 2006-08-21 07:53:25+02:00, jonas@stripped +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/ndb/ndb_config_2_node.ini@stripped, 2006-08-21 07:53:25+02:00, jonas@stripped +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/ndb/ndb_config_4_node.ini@stripped, 2006-08-21 07:53:25+02:00, jonas@stripped +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/t/rpl_ndb_basic.test@stripped, 2006-08-21 07:53:25+02:00, jonas@stripped +2 -2
    revert timeout changes, as a test depends on it, it mysterious ways

# 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/mysql-5.1-new-ndb

--- 1.19/mysql-test/ndb/ndb_config_2_node.ini	2006-08-21 07:53:31 +02:00
+++ 1.20/mysql-test/ndb/ndb_config_2_node.ini	2006-08-21 07:53:31 +02:00
@@ -20,7 +20,7 @@
 # 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

--- 1.3/mysql-test/ndb/ndb_config_1_node.ini	2006-08-21 07:53:31 +02:00
+++ 1.4/mysql-test/ndb/ndb_config_1_node.ini	2006-08-21 07:53:31 +02:00
@@ -17,7 +17,7 @@
 # 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

--- 1.3/mysql-test/ndb/ndb_config_4_node.ini	2006-08-21 07:53:31 +02:00
+++ 1.4/mysql-test/ndb/ndb_config_4_node.ini	2006-08-21 07:53:31 +02:00
@@ -17,7 +17,7 @@
 # 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

--- 1.7/mysql-test/t/rpl_ndb_basic.test	2006-08-21 07:53:31 +02:00
+++ 1.8/mysql-test/t/rpl_ndb_basic.test	2006-08-21 07:53:31 +02:00
@@ -116,7 +116,7 @@
 # we do this 2 times, once with few retries to verify that we 
 # get a failure with the set sleep, and once with the _same_
 # sleep, but with more retries to get it to succeed
---sleep 15
+--sleep 5
 
 # replication should have stopped, since max retries where not enough
 # verify with show slave status
@@ -131,7 +131,7 @@
 START SLAVE;
 # wait for deadlock to be detected and retried
 # should be the same sleep as above for test to be valid
---sleep 15
+--sleep 5
 
 # commit transaction to release lock on row and let replication succeed
 select * from t1 order by nid;