summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-01-28 12:35:46 +0100
committerunknown <kent@mysql.com>2006-01-28 12:35:46 +0100
commita73b7dc2439879e36ee522d29f76f229f70213d2 (patch)
tree83d94850c76ca9e6beb72b4237223940829e73c8 /mysql-test
parente14c9c5d9c82666118a1384853ec0a57c3d1cd61 (diff)
downloadmariadb-git-a73b7dc2439879e36ee522d29f76f229f70213d2.tar.gz
mysql-test-run.sh:
Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE mysql-test/mysql-test-run.sh: Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 296bbecc843..3488c308536 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -207,8 +207,13 @@ 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`