Commit eb6b2bdc authored by unknown's avatar unknown
Browse files

Manual merge. 


mysql-test/lib/mtr_process.pl:
  Auto merged
parents b3dad934 8fc0c48d

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

+10 −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=""
@@ -341,6 +342,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 +1659,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