Commit ae705221 authored by unknown's avatar unknown
Browse files

Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled

parent f177075e

mysql-test/mysql-test-run.pl

+3 −2
Original line number Diff line number Diff line
@@ -1392,8 +1392,6 @@ sub environment_setup () { 
  $ENV{'NDBCLUSTER_PORT'}=          $opt_ndbcluster_port;

  $ENV{'NDBCLUSTER_PORT_SLAVE'}=    $opt_ndbcluster_port_slave;



  $ENV{'NDB_STATUS_OK'}=            $clusters->[0]->{'installed_ok'};

  $ENV{'NDB_SLAVE_STATUS_OK'}=      $clusters->[0]->{'installed_ok'};;

  $ENV{'NDB_EXTRA_TEST'}=           $opt_ndb_extra_test;



  $ENV{'NDB_BACKUP_DIR'}=           $clusters->[0]->{'data_dir'};
@@ -2260,6 +2258,9 @@ sub mysql_install_db () { 
    }

  }



  $ENV{'NDB_STATUS_OK'}=            $clusters->[0]->{'installed_ok'};

  $ENV{'NDB_SLAVE_STATUS_OK'}=      $clusters->[1]->{'installed_ok'};;



  if ( ! $cluster_started_ok )

  {

    if ( $opt_force)