1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Clean up after big merge

This commit is contained in:
jimw@mysql.com
2006-05-01 00:14:32 -07:00
parent f21c110d13
commit b4586b2908
6 changed files with 11 additions and 7 deletions

View File

@ -428,7 +428,8 @@ sub main () {
$need_im||= $test->{component_id} eq 'im';
$use_slaves||= $test->{slave_num};
}
$opt_with_ndbcluster= 0 unless $need_ndbcluster;
$opt_with_ndbcluster= $opt_with_ndbcluster_slave= 0
unless $need_ndbcluster;
$opt_skip_im= 1 unless $need_im;
snapshot_setup();
@ -3234,8 +3235,8 @@ sub run_mysqltest ($) {
$ENV{'UDF_EXAMPLE_LIB'}=
($lib_udf_example ? basename($lib_udf_example) : "");
$ENV{'NDB_STATUS_OK'}= $flag_ndb_status_ok;
$ENV{'NDB_SLAVE_STATUS_OK'}= $flag_ndb_slave_status_ok;
$ENV{'NDB_STATUS_OK'}= $flag_ndb_status_ok ? "YES" : "NO";
$ENV{'NDB_SLAVE_STATUS_OK'}= $flag_ndb_slave_status_ok ? "YES" : "NO";
$ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test;
$ENV{'NDB_MGM'}= $exe_ndb_mgm;
$ENV{'NDB_BACKUP_DIR'}= $path_ndb_data_dir;