bk commit into 5.0 tree (kent:1.2295)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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-11-10 02:28:31+01:00, kent@stripped +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
  into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
  MERGE: 1.1616.2144.193

  mysql-test/mysql-test-run.sh@stripped, 2006-11-10 02:27:50+01:00, kent@stripped +0 -0
    Auto merged
    MERGE: 1.208.1.62

# 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:	kent
# Host:	c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/lic/my50-lic/RESYNC

--- 1.309/mysql-test/mysql-test-run.sh	2006-11-10 02:29:24 +01:00
+++ 1.310/mysql-test/mysql-test-run.sh	2006-11-10 02:29:24 +01:00
@@ -1750,10 +1750,13 @@
        --result-file=*)
          result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
          result_file="r/$result_file.result"
-         # Note that this must be set to space, not "" for test-reset to
-# work
+         # Note that this must be set to space, not "" for test-reset to work
 	 EXTRA_MASTER_OPT=" "
          ;;
+       --force-restart)
+         # Note that this must be set to space, not "" for test-reset to work
+	 EXTRA_MASTER_OPT=" "
+	 ;;
      esac
      stop_master
      stop_master 1