Commit c3e8fb57 authored by unknown's avatar unknown
Browse files

Set the environment variable NDB_STATUS_OK to indicate that cluster is... 

Set the environment variable NDB_STATUS_OK to indicate that cluster is installed ok. This is actually not needed for this script as it will
skip ndb tests if cluster install failed. But provided for compatibility


mysql-test/include/have_ndb.inc:
  Revert
parent 4c893129

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

+13 −0
Original line number Diff line number Diff line
@@ -2665,6 +2665,19 @@ sub do_before_run_mysqltest($) 
  {

    mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");

  }



  if ( $mysql_version_id < 50000 )

  {

    # Set envirnoment variable NDB_STATUS_OK to 1

    # if script decided to run mysqltest cluster _is_ installed ok

    $ENV{'NDB_STATUS_OK'} = "1";

  }

  elsif ( $mysql_version_id < 50100 )

  {

    # Set envirnoment variable NDB_STATUS_OK to YES

    # if script decided to run mysqltest cluster _is_ installed ok

    $ENV{'NDB_STATUS_OK'} = "YES";

  }

}



sub do_after_run_mysqltest($)