diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-12-14 18:21:41 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-12-14 18:21:41 -0500 |
| commit | ce72497b2b25618265a59b694ad438f6d7971be2 (patch) | |
| tree | 93be4d33fc1973280f3f9dcc9b718e79cb56040b | |
| parent | e91334334e83617859c308e9a8f5f99ec34c80da (diff) | |
| parent | cd2cf28aa84c4ec1d9899bf7088841a8615edea1 (diff) | |
| download | mariadb-git-ce72497b2b25618265a59b694ad438f6d7971be2.tar.gz | |
Fix for Bug#21970.
Added a space between $MASTER_MYPORT and "+ 1" to ensure that the script correctly output 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 a81a3b8b607..f2b92f6aab0 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -2061,7 +2061,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=`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=`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 |