diff options
| author | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
| commit | a6c8de9163dad414ac2749e0fed7b776b7137212 (patch) | |
| tree | 8ef0c2d5e3dd04138fa175b2c147a5ae891ba2d1 /mysql-test/mysql-test-run.pl | |
| parent | c3c5f8d6d73ff71e9b49d8ce0bf4fa4be865b1da (diff) | |
| download | mariadb-git-a6c8de9163dad414ac2749e0fed7b776b7137212.tar.gz | |
Clean up after big merge
config/ac-macros/yassl.m4:
Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
Update results
sql/mysqld.cc:
Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
Remove duplicate of prepared_stmt_count (bad merge)
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fc8495e6acc..30ac61c80e8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; |