database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Cleanup with/skip/supported-ndbcluster

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-03-10 16:38:28 +01:00
parent 5dbb4c96eb
commit 6967aa18e5
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/mysql-test-run.pl
View File

@ -181,8 +181,7 @@ our $opt_warnings= 1;
our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster= 0;
our $opt_skip_ndbcluster_slave= 0; our $opt_skip_ndbcluster_slave= 0;
our $opt_with_ndbcluster= 0; our $opt_with_ndbcluster;
our $glob_ndbcluster_supported= 0;
our $opt_ndb_extra_test= 0; our $opt_ndb_extra_test= 0;
our $exe_ndb_mgm=""; our $exe_ndb_mgm="";
@ -1101,7 +1100,7 @@ sub environment_setup {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Add the path where libndbclient can be found # Add the path where libndbclient can be found
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ( $glob_ndbcluster_supported ) if ( !$opt_skip_ndbcluster )
{ {
push(@ld_library_paths, "$basedir/storage/ndb/src/.libs"); push(@ld_library_paths, "$basedir/storage/ndb/src/.libs");
} }
@ -1549,28 +1548,20 @@ sub check_ndbcluster_support ($) {
if ($opt_skip_ndbcluster) if ($opt_skip_ndbcluster)
{ {
mtr_report(" - skipping ndbcluster"); mtr_report(" - skipping ndbcluster");
$opt_skip_ndbcluster_slave= 1; $opt_skip_ndbcluster_slave= $opt_skip_ndbcluster;
return; return;
} }
if ( ! $mysqld_variables{'ndb-connectstring'} ) if ( ! $mysqld_variables{'ndb-connectstring'} )
{ {
mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster"); mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster");
$opt_skip_ndbcluster= 1; $opt_skip_ndbcluster= 2;
$opt_skip_ndbcluster_slave= 1; $opt_skip_ndbcluster_slave= 2;
return; return;
} }
$glob_ndbcluster_supported= 1;
mtr_report(" - using ndbcluster when necessary, mysqld supports it"); mtr_report(" - using ndbcluster when necessary, mysqld supports it");
if ( $mysql_version_id < 50100 )
{
# Slave cluster is not supported until 5.1
$opt_skip_ndbcluster_slave= 1;
}
return; return;
} }