Skip to content

M
mariadb
Commit 0f54eccb authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

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

parent 9335cba3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
mysql-test/mysql-test-run.pl
View file @ 0f54eccb
...@@ -1392,8 +1392,6 @@ sub environment_setup () { ...@@ -1392,8 +1392,6 @@ sub environment_setup () {
$ENV{'NDBCLUSTER_PORT'}= $opt_ndbcluster_port; $ENV{'NDBCLUSTER_PORT'}= $opt_ndbcluster_port;
$ENV{'NDBCLUSTER_PORT_SLAVE'}= $opt_ndbcluster_port_slave; $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_EXTRA_TEST'}= $opt_ndb_extra_test;
$ENV{'NDB_BACKUP_DIR'}= $clusters->[0]->{'data_dir'}; $ENV{'NDB_BACKUP_DIR'}= $clusters->[0]->{'data_dir'};
...@@ -2260,6 +2258,9 @@ sub mysql_install_db () { ...@@ -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 ( ! $cluster_started_ok )
{ {
if ( $opt_force) if ( $opt_force)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7