diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-12-14 19:13:07 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-12-14 19:13:07 -0500 |
| commit | 3991c0509fc91766ffbf305969d58babc1295a67 (patch) | |
| tree | 0b9b44633480ab696a909e7bc233fa8058097004 /mysql-test/mysql-test-run-shell.sh | |
| parent | 501f92474e27c427ae971b736401f4368e93b36d (diff) | |
| parent | ce72497b2b25618265a59b694ad438f6d7971be2 (diff) | |
| download | mariadb-git-3991c0509fc91766ffbf305969d58babc1295a67.tar.gz | |
Merge shakedown.(none):/home/jpipes/dev/bug21970/my50-bug21970
into shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
mysql-test/mysql-test-run-shell.sh:
Fix for Bug#21970
Usage of "MASTER_MYPORT+1" caused a string "9306+1" to be evaluated instead of the correct "9307". Thie fix was adding a space around the plus sign.
Merged changes from 5.0 into 5.1; kept addition of --protocol=tcp in the 5.1 shell script entries and corrected the expression evaluation by adding a space between MASTER_MYPORT and "+1" to ensure that 9307 is output instead of the string "9306+1"
Diffstat (limited to 'mysql-test/mysql-test-run-shell.sh')
| -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 c6da525c159..953478fa9f4 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -2160,7 +2160,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 --protocol=tcp -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --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 --protocol=tcp --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 --protocol=tcp --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --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 |