Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0

5 files changed, 9 insertions, 8 deletions

diff --git a/ndb/test/run-test/conf-daily-basic-dl145a.txt b/ndb/test/run-test/conf-daily-basic-dl145a.txt
index 101d5e4b221..d8cf8d34d82 100644
--- a/ndb/test/run-test/conf-daily-basic-dl145a.txt
+++ b/ndb/test/run-test/conf-daily-basic-dl145a.txt
@@ -1,4 +1,4 @@
-baseport: 16000
+baseport: 14000
 basedir: /home/ndbdev/autotest/run
 mgm: CHOOSE_host1
 ndb: CHOOSE_host2 CHOOSE_host3 
diff --git a/ndb/test/run-test/conf-daily-basic-ndbmaster.txt b/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
index 695fe64c799..bcd809593f3 100644
--- a/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
+++ b/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
@@ -1,4 +1,4 @@
-baseport: 16000
+baseport: 14000
 basedir: /space/autotest
 mgm: CHOOSE_host1
 ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3
diff --git a/ndb/test/run-test/conf-daily-devel-ndbmaster.txt b/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
index 695fe64c799..8b340e6a39d 100644
--- a/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
+++ b/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
@@ -14,6 +14,6 @@ DataDir: .
 FileSystemPath: /space/autotest/run
 
 [MGM DEFAULT]
-PortNumber: 14000
+PortNumber: 16000
 ArbitrationRank: 1
 DataDir: .
diff --git a/ndb/test/run-test/conf-daily-sql-ndbmaster.txt b/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
index a5eadd9f361..0d6a99f8d48 100644
--- a/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
+++ b/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
@@ -15,6 +15,6 @@ DataDir: .
 FileSystemPath: /space/autotest/run
 
 [MGM DEFAULT]
-PortNumber: 14000
+PortNumber: 16000
 ArbitrationRank: 1
 DataDir: .
diff --git a/ndb/test/run-test/ndb-autotest.sh b/ndb/test/run-test/ndb-autotest.sh
index 596bfea63a7..dce60c41135 100755
--- a/ndb/test/run-test/ndb-autotest.sh
+++ b/ndb/test/run-test/ndb-autotest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 save_args=$*
-VERSION="ndb-autotest.sh version 1.03"
+VERSION="ndb-autotest.sh version 1.04"
 
 DATE=`date '+%Y-%m-%d'`
 export DATE
@@ -208,9 +208,10 @@ start(){
 }
 
 count_hosts(){
-    grep "CHOOSE_host" $1 |
-    awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |
-    | sort | uniq | wc -l
+    cnt=`grep "CHOOSE_host" $1 |
+      awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |
+      sort | uniq | wc -l`
+    echo $cnt
 }
 
 p=`pwd`