Commit eaaaa760 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/comment-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
parents bf912125 ca3dd7f0

mysql-test/mysql-test-run.pl

+11 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest 


our @opt_extra_mysqld_opt;



our $opt_comment;

our $opt_compress;

our $opt_current_test;

our $opt_ddd;
@@ -536,6 +537,7 @@ sub command_line_setup () { 


             # Misc

             'big-test'                 => \$opt_big_test,

             'comment=s'                => \$opt_comment,

             'compress'                 => \$opt_compress,

             'debug'                    => \$opt_debug,

             'fast'                     => \$opt_fast,
@@ -571,6 +573,14 @@ sub command_line_setup () { 
    usage("");

  }



  if ( $opt_comment )

  {

    print "\n";

    print '#' x 78, "\n";

    print "# $opt_comment\n";

    print '#' x 78, "\n\n";

  }



  foreach my $arg ( @ARGV )

  {

    if ( $arg =~ /^--skip-/ )
@@ -2398,6 +2408,7 @@ Misc options 


  verbose               Verbose output from this script

  script-debug          Debug this script itself

  comment=STR           Write STR to the output

  compress              Use the compressed protocol between client and server

  timer                 Show test case execution time

  start-and-exit        Only initiate and start the "mysqld" servers, use the startup

mysql-test/mysql-test-run.sh

+7 −0
Original line number Diff line number Diff line
@@ -476,6 +476,13 @@ while test $# -gt 0; do 
    --fast)

      FAST_START=1

      ;;

    --comment=*)

      TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"`

      echo

      echo '############################################'

      echo "# $TMP"

      echo '############################################'

      ;;

    -- )  shift; break ;;

    --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;

    * ) break ;;