Commit c903266a authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0
parents 7d0041e8 10176212

ndb/test/run-test/conf-daily-basic-dl145a.txt

+1 −1
Original line number Diff line number Diff line 
baseport: 16000

baseport: 14000

basedir: /home/ndbdev/autotest/run

mgm: CHOOSE_host1

ndb: CHOOSE_host2 CHOOSE_host3

ndb/test/run-test/conf-daily-basic-ndbmaster.txt

+1 −1
Original line number Diff line number Diff line 
baseport: 16000

baseport: 14000

basedir: /space/autotest

mgm: CHOOSE_host1

ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3

ndb/test/run-test/conf-daily-devel-ndbmaster.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ DataDir: . 
FileSystemPath: /space/autotest/run



[MGM DEFAULT]

PortNumber: 14000

PortNumber: 16000

ArbitrationRank: 1

DataDir: .

ndb/test/run-test/conf-daily-sql-ndbmaster.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ DataDir: . 
FileSystemPath: /space/autotest/run



[MGM DEFAULT]

PortNumber: 14000

PortNumber: 16000

ArbitrationRank: 1

DataDir: .

ndb/test/run-test/ndb-autotest.sh

+5 −4
Original line number Diff line number Diff line 
#!/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 |

    cnt=`grep "CHOOSE_host" $1 |

      awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |

    | sort | uniq | wc -l

      sort | uniq | wc -l`

    echo $cnt

}



p=`pwd`