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"

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