bk commit into 4.1 tree (jonas:1.2476)

[jonas]

Below is the list of changes that have just been committed into a local
4.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
  1.2476 06/03/22 12:11:51 jonas@stripped +5 -0
  ndb -
    minor update to ndb-autotest.sh and config files

  ndb/test/run-test/ndb-autotest.sh
    1.17 06/03/22 12:11:49 jonas@stripped +3 -0
    Add support for conf per host

  ndb/test/run-test/conf-shark.txt
    1.3 06/03/22 12:11:49 jonas@stripped +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.5 06/03/22 12:11:49 jonas@stripped +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-dl145a.txt
    1.6 06/03/22 12:11:49 jonas@stripped +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.4 06/03/22 12:11:49 jonas@stripped +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.4 06/03/22 12:04:50 jonas@stripped +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> ndb/test/run-test/conf-ndbmaster.txt

  ndb/test/run-test/conf-shark.txt
    1.2 06/03/22 12:03:51 jonas@stripped +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> ndb/test/run-test/conf-shark.txt

  ndb/test/run-test/conf-dl145a.txt
    1.5 06/03/22 12:03:14 jonas@stripped +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> ndb/test/run-test/conf-dl145a.txt

# 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/41-work

--- 1.4/ndb/test/run-test/conf-daily-basic-dl145a.txt	2005-05-07 18:20:26 +02:00
+++ 1.6/ndb/test/run-test/conf-dl145a.txt	2006-03-22 12:11:49 +01:00
@@ -17,3 +17,6 @@
 PortNumber: 14000
 ArbitrationRank: 1
 DataDir: .
+
+[TCP DEFAULT]
+SendBufferMemory: 2M

--- 1.3/ndb/test/run-test/conf-daily-basic-ndbmaster.txt	2005-05-07 18:20:26 +02:00
+++ 1.5/ndb/test/run-test/conf-ndbmaster.txt	2006-03-22 12:11:49 +01:00
@@ -17,3 +17,6 @@
 PortNumber: 14000
 ArbitrationRank: 1
 DataDir: .
+
+[TCP DEFAULT]
+SendBufferMemory: 2M

--- 1.1/ndb/test/run-test/conf-daily-basic-shark.txt	2005-05-06 16:41:43 +02:00
+++ 1.3/ndb/test/run-test/conf-shark.txt	2006-03-22 12:11:49 +01:00
@@ -17,3 +17,6 @@
 PortNumber: 14000
 ArbitrationRank: 1
 DataDir: .
+
+[TCP DEFAULT]
+SendBufferMemory: 2M

--- 1.3/ndb/test/run-test/conf-daily-devel-ndbmaster.txt	2005-05-07 18:20:26 +02:00
+++ 1.4/ndb/test/run-test/conf-daily-devel-ndbmaster.txt	2006-03-22 12:11:49 +01:00
@@ -17,3 +17,6 @@
 PortNumber: 16000
 ArbitrationRank: 1
 DataDir: .
+
+[TCP DEFAULT]
+SendBufferMemory: 2M

--- 1.16/ndb/test/run-test/ndb-autotest.sh	2005-06-30 10:05:02 +02:00
+++ 1.17/ndb/test/run-test/ndb-autotest.sh	2006-03-22 12:11:49 +01:00
@@ -299,9 +299,12 @@
     elif [ -f $test_dir/conf-$1.txt ]
     then
 	echo "$test_dir/conf-$1.txt"
+    elif [ -f $test_dir/conf-$HOST.txt ]
+	echo "$test_dir/conf-$HOST.txt"
     else
 	echo "Unable to find conf file looked for" 1>&2
 	echo "$test_dir/conf-$1-$HOST.txt and" 1>&2
+	echo "$test_dir/conf-$HOST.txt" 1>&2
 	echo "$test_dir/conf-$1.txt" 1>&2
 	exit
     fi