Commit 5be12eba authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents edae64f4 41dffbb1

mysql-test/include/have_ndb.inc

+1 −0
Original line number Diff line number Diff line 
--exec test x$NDB_STATUS_OK = x1

-- require r/have_ndb.require

disable_query_log;

show variables like "have_ndbcluster";

mysql-test/mysql-test-run.sh

+17 −6
Original line number Diff line number Diff line
@@ -693,6 +693,8 @@ export NDB_MGM 
export NDB_BACKUP_DIR

export NDB_TOOLS_OUTPUT

export PURIFYOPTIONS

NDB_STATUS_OK=1

export NDB_STATUS_OK



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

 --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \
@@ -1055,7 +1057,15 @@ start_ndbcluster() 
    else

      NDBCLUSTER_EXTRA_OPTS="--small"

    fi

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STATUS_OK=0

    if [ x$NDB_STATUS_OK != x1 ] ; then

      if [ x$FORCE != x1 ] ; then

        exit 1

      fi

      USE_NDBCLUSTER=

      return

    fi



    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"

  else

    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
@@ -1620,6 +1630,12 @@ run_testcase () 
     fi

   fi

 fi



 if [ "x$START_AND_EXIT" = "x1" ] ; then

  echo "Servers started, exiting"

  exit

 fi



 cd $MYSQL_TEST_DIR



 if [ -f $tf ] ; then
@@ -1757,11 +1773,6 @@ then 
  mysql_loadstd

fi



if [ "x$START_AND_EXIT" = "x1" ] ; then

 echo "Servers started, exiting"

 exit

fi



$ECHO  "Starting Tests"



#