Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic

       --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