diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-08-20 20:46:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-08-20 20:46:50 +0200 |
| commit | ae705221dd91c390e917fdf590932ac59b521ea4 (patch) | |
| tree | 742f731d8e26f2be82a5e462a8abb71c046ac84d /mysql-test/mysql-test-run.pl | |
| parent | f177075e03d49ae60a1211ab7fb34466dee5e5bd (diff) | |
| download | mariadb-git-ae705221dd91c390e917fdf590932ac59b521ea4.tar.gz | |
Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9907bb3a181..af59c39cda7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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) |