Commit 6b5c0b11 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/M50/mtr-5.0
parents f7b039cc 9af841da

mysql-test/lib/mtr_process.pl

+2 −3
Original line number Diff line number Diff line
@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () { 


        if ( kill(0, @pids) )           # Check if some left

        {

          # FIXME maybe just mtr_warning() ?

          mtr_error("can't kill process(es) " . join(" ", @pids));

          mtr_warning("can't kill process(es) " . join(" ", @pids));

        }

      }

    }
@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () { 
  {

    if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) )

    {

      mtr_error("can't kill old mysqld holding port $srv->{'port'}");

      mtr_warning("can't kill old mysqld holding port $srv->{'port'}");

    }

  }

}

mysql-test/mysql-test-run.pl

+9 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ our $opt_udiff; 


our $opt_skip_ndbcluster;

our $opt_with_ndbcluster;

our $opt_with_ndbcluster_only= 0;  # dummy, ignored



our $opt_with_openssl;



our $exe_ndb_mgm;

our $path_ndb_tools_dir;
@@ -572,6 +575,7 @@ sub command_line_setup () { 
             'force'                    => \$opt_force,

             'with-ndbcluster'          => \$opt_with_ndbcluster,

             'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,

             'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,

             'do-test=s'                => \$opt_do_test,

             'suite=s'                  => \$opt_suite,

             'skip-rpl'                 => \$opt_skip_rpl,
@@ -677,6 +681,11 @@ sub command_line_setup () { 
    print '#' x 78, "\n\n";

  }



  if ( $opt_with_ndbcluster_only )

  {

    print "# Option '--with-ndbcluster-only' is ignored in this release.\n";

  }



  foreach my $arg ( @ARGV )

  {

    if ( $arg =~ /^--skip-/ )

mysql-test/mysql-test-run.sh

+12 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT="" 
EXTRA_MYSQLBINLOG_OPT=""

USE_RUNNING_SERVER=0

USE_NDBCLUSTER=@USE_NDBCLUSTER@

USE_NDBCLUSTER_ONLY=0

USE_RUNNING_NDBCLUSTER=""

USE_PURIFY=""

PURIFY_LOGS=""
@@ -315,6 +316,8 @@ STRESS_INIT_FILE="" 
STRESS_TEST_FILE=""

STRESS_TEST=""



$ECHO "Logging: $0 $*"   # To ensure we see all arguments in the output, for the test analysis tool



while test $# -gt 0; do

  case "$1" in

    --embedded-server)
@@ -341,6 +344,10 @@ while test $# -gt 0; do 
    --extern)  USE_RUNNING_SERVER=1 ;;

    --with-ndbcluster)

      USE_NDBCLUSTER="--ndbcluster" ;;

    --with-ndbcluster-only)

      USE_NDBCLUSTER="--ndbcluster"

      USE_NDBCLUSTER_SLAVE="--ndbcluster"

      USE_NDBCLUSTER_ONLY=1 ;;

    --ndb-connectstring=*)

      USE_NDBCLUSTER="--ndbcluster" ;

      USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;
@@ -1654,6 +1661,11 @@ run_testcase () 
 result_file="r/$tname.result"

 echo $tname > $CURRENT_TEST

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0 \& \( $tname : federated \) = 0`

 NDBCLUSTER_TEST=`$EXPR \( $tname : '.*ndb.*' \) != 0`

 if [ "x$USE_NDBCLUSTER_ONLY" = "x1" -a "x$NDBCLUSTER_TEST" != "x1" ] ; then

   skip_test $tname

   return

 fi

 if [ "$USE_MANAGER" = 1 ] ; then

  many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`

 fi