diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-12-14 14:54:59 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-12-14 14:54:59 -0500 |
| commit | cd2cf28aa84c4ec1d9899bf7088841a8615edea1 (patch) | |
| tree | 8a6a27053732ce6f4c7d4452c369975836f4f982 | |
| parent | 9e48e73f9a8727a1e81a8da12b7634ee47b5779a (diff) | |
| download | mariadb-git-cd2cf28aa84c4ec1d9899bf7088841a8615edea1.tar.gz | |
Fix for Bug#21970.
The mysql-test-run-shell.sh script was improperly evaluating an expression for setting up multiple masters.
This fix adds the `expr $MASTER_MYPORT + 1` construct to the offending line in order for the expression to evaluate properly and produce 9307 instead of the string "9306+1"
| -rw-r--r-- | mysql-test/mysql-test-run-shell.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run-shell.sh b/mysql-test/mysql-test-run-shell.sh index 544721cf40d..92c64260112 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -1793,7 +1793,7 @@ then $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT+1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 + $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $MASTER_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 sleep_until_file_deleted 0 $MASTER_MYPID |