diff options
| author | unknown <kent@mysql.com> | 2006-02-11 23:23:39 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-11 23:23:39 +0100 |
| commit | 8dc654f66d6a11c40d848148d66fa2846d78c42f (patch) | |
| tree | 1480d132d95c4750e3bdbff21cfa0fbe7a08656a /mysql-test/mysql-test-run.sh | |
| parent | fe91a5c929473b897c9ea2e031625073cd441f54 (diff) | |
| parent | 8824fd1c3b9ba5b172092fd2d2b4918c1479d3a9 (diff) | |
| download | mariadb-git-8dc654f66d6a11c40d848148d66fa2846d78c42f.tar.gz | |
Merge
mysql-test/mysql-test-run.sh:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d9c5f7f0ecb..df3b8090ab0 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -247,11 +247,16 @@ MYSQL_MANAGER_USER=root # an environment variable can be used to control all ports. A small # number is to be used, 0 - 16 or similar. # +# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x +# versions of this script, else a 4.0 test run might conflict with a +# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means +# all port numbers might not be used in this version of the script. +# if [ -n "$MTR_BUILD_THREAD" ] ; then - MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000` + MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000` MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2` SLAVE_MYPORT=`expr $MASTER_MYPORT + 3` - NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4` + NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6` echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" echo "Using MASTER_MYPORT = $MASTER_MYPORT" |