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

into mysql.com:/home/jonas/src/mysql-5.0
This commit is contained in:
joreland@mysql.com 2005-05-07 18:21:36 +02:00
commit 4d1804ebb1
5 changed files with 9 additions and 8 deletions

View file

@ -1,4 +1,4 @@
baseport: 16000
baseport: 14000
basedir: /home/ndbdev/autotest/run
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3

View file

@ -1,4 +1,4 @@
baseport: 16000
baseport: 14000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3

View file

@ -14,6 +14,6 @@ DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
PortNumber: 16000
ArbitrationRank: 1
DataDir: .

View file

@ -15,6 +15,6 @@ DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
PortNumber: 16000
ArbitrationRank: 1
DataDir: .

View file

@ -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`