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.2235 05/05/06 19:20:32 joreland@stripped +5 -0
ndb - autotest
fix count of nodes needed in test
ndb/test/run-test/ndb-autotest.sh
1.6 05/05/06 19:20:29 joreland@stripped +8 -2
Fix count of needed computers for test
ndb/test/run-test/conf-daily-sql-ndbmaster.txt
1.2 05/05/06 19:20:29 joreland@stripped +2 -2
Fix typo
ndb/test/run-test/conf-daily-devel-ndbmaster.txt
1.2 05/05/06 19:20:29 joreland@stripped +1 -1
Fix typo
ndb/test/run-test/conf-daily-basic-ndbmaster.txt
1.2 05/05/06 19:20:29 joreland@stripped +1 -1
Fix typo
ndb/test/run-test/conf-daily-basic-dl145a.txt
1.2 05/05/06 19:20:29 joreland@stripped +1 -1
Fix typo
# 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: joreland
# Host: eel.mysql.com
# Root: /home/jonas/src/mysql-4.1
--- 1.1/ndb/test/run-test/conf-daily-basic-dl145a.txt Fri May 6 16:41:43 2005
+++ 1.2/ndb/test/run-test/conf-daily-basic-dl145a.txt Fri May 6 19:20:29 2005
@@ -2,7 +2,7 @@
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3
-api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
+api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
--- 1.1/ndb/test/run-test/conf-daily-basic-ndbmaster.txt Fri May 6 16:41:43 2005
+++ 1.2/ndb/test/run-test/conf-daily-basic-ndbmaster.txt Fri May 6 19:20:29 2005
@@ -2,7 +2,7 @@
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3
-api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
+api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
--- 1.1/ndb/test/run-test/conf-daily-devel-ndbmaster.txt Fri May 6 16:41:44 2005
+++ 1.2/ndb/test/run-test/conf-daily-devel-ndbmaster.txt Fri May 6 19:20:29 2005
@@ -2,7 +2,7 @@
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3
-api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
+api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
--- 1.1/ndb/test/run-test/conf-daily-sql-ndbmaster.txt Fri May 6 16:41:44 2005
+++ 1.2/ndb/test/run-test/conf-daily-sql-ndbmaster.txt Fri May 6 19:20:29 2005
@@ -2,8 +2,8 @@
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3
-mysqld: CHOOSE_host1 CHOOSE_hosts4
-mysql: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4
+mysqld: CHOOSE_host1 CHOOSE_host4
+mysql: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host4 CHOOSE_host4 CHOOSE_host4 CHOOSE_host4 CHOOSE_host4 CHOOSE_host4
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
--- 1.5/ndb/test/run-test/ndb-autotest.sh Fri May 6 18:58:43 2005
+++ 1.6/ndb/test/run-test/ndb-autotest.sh Fri May 6 19:20:29 2005
@@ -211,6 +211,12 @@
rm -f /tmp/res.$$.tgz
}
+count_hosts(){
+ grep "CHOOSE_host" $1 |
+ awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |
+ wc -l
+}
+
p=`pwd`
for dir in $RUN
do
@@ -222,7 +228,8 @@
mkdir -p $run_dir $res_dir
rm -rf $res_dir/* $run_dir/*
- count=`grep -c "COMPUTER" $run_dir/1.ndb_mgmd/initconfig.template`
+ conf=`choose_conf $dir`
+ count=`count_hosts $conf`
avail_hosts=`filter /tmp/filter_hosts.$$ $hosts`
avail=`echo $avail_hosts | wc -w`
if [ $count -gt $avail ]
@@ -233,7 +240,6 @@
fi
run_hosts=`echo $avail_hosts| awk '{for(i=1;i<='$count';i++)print $i;}'`
- conf=`choose_conf $dir`
choose $conf $run_hosts > $run_dir/d.txt
(cd $run_dir; $mkconfig d.txt )
| Thread |
|---|
| • bk commit into 4.1 tree (joreland:1.2235) | jonas.oreland | 6 May |
