bk commit into 4.1 tree (jpipes:1.2582) BUG#21970

[<jpipes]

Below is the list of changes that have just been committed into a local
4.1 repository of jpipes. When jpipes does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-14 14:54:59-05:00, jpipes@shakedown.(none) +1 -0
  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"  

  mysql-test/mysql-test-run-shell.sh@stripped, 2006-12-14 14:54:57-05:00,
jpipes@shakedown.(none) +1 -1
    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"  

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jpipes
# Host:	shakedown.(none)
# Root:	/home/jpipes/dev/bug21970/my41-bug21970

--- 1.273/mysql-test/mysql-test-run-shell.sh	2006-12-14 14:55:03 -05:00
+++ 1.274/mysql-test/mysql-test-run-shell.sh	2006-12-14 14:55:03 -05:00
@@ -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