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

Merge

Browse Source
This commit is contained in:
Magnus Blåudd
2011-01-24 11:09:53 +01:00
parent 342291c0e4 8834fda51b
commit 243b95fba5
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ require "lib/mtr_misc.pl";
$SIG{INT}= sub { mtr_error("Got ^C signal"); }; $SIG{INT}= sub { mtr_error("Got ^C signal"); };
our $mysql_version_id; our $mysql_version_id;
my $mysql_version_extra;
our $glob_mysql_test_dir; our $glob_mysql_test_dir;
our $basedir; our $basedir;
our $bindir; our $bindir;
@ -1667,12 +1668,13 @@ sub collect_mysqld_features {
# Look for version # Look for version
my $exe_name= basename($exe_mysqld); my $exe_name= basename($exe_mysqld);
mtr_verbose("exe_name: $exe_name"); mtr_verbose("exe_name: $exe_name");
if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ ) if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)([^\s]*)/ )
{ {
#print "Major: $1 Minor: $2 Build: $3\n"; #print "Major: $1 Minor: $2 Build: $3\n";
$mysql_version_id= $1*10000 + $2*100 + $3; $mysql_version_id= $1*10000 + $2*100 + $3;
#print "mysql_version_id: $mysql_version_id\n"; #print "mysql_version_id: $mysql_version_id\n";
mtr_report("MySQL Version $1.$2.$3"); mtr_report("MySQL Version $1.$2.$3");
$mysql_version_extra= $4;
} }
} }
else else
@ -1757,12 +1759,13 @@ sub collect_mysqld_features_from_running_server ()
# Parse version # Parse version
my $version_str= $mysqld_variables{'version'}; my $version_str= $mysqld_variables{'version'};
if ( $version_str =~ /^([0-9]*)\.([0-9]*)\.([0-9]*)/ ) if ( $version_str =~ /^([0-9]*)\.([0-9]*)\.([0-9]*)([^\s]*)/ )
{ {
#print "Major: $1 Minor: $2 Build: $3\n"; #print "Major: $1 Minor: $2 Build: $3\n";
$mysql_version_id= $1*10000 + $2*100 + $3; $mysql_version_id= $1*10000 + $2*100 + $3;
#print "mysql_version_id: $mysql_version_id\n"; #print "mysql_version_id: $mysql_version_id\n";
mtr_report("MySQL Version $1.$2.$3"); mtr_report("MySQL Version $1.$2.$3");
$mysql_version_extra= $4;
} }
mtr_error("Could not find version of MySQL") unless $mysql_version_id; mtr_error("Could not find version of MySQL") unless $mysql_version_id;
} }
@ -2538,6 +2541,17 @@ sub vs_config_dirs ($$) {
sub check_ndbcluster_support ($) { sub check_ndbcluster_support ($) {
my $mysqld_variables= shift; my $mysqld_variables= shift;
# Check if this is MySQL Cluster, ie. mysql version string ends
# with -ndb-Y.Y.Y[-status]
if ( defined $mysql_version_extra &&
$mysql_version_extra =~ /^-ndb-/ )
{
mtr_report(" - MySQL Cluster");
# Enable ndb engine and add more test suites
$opt_include_ndbcluster = 1;
$DEFAULT_SUITES.=",ndb";
}
if ($opt_include_ndbcluster) if ($opt_include_ndbcluster)
{ {
$opt_skip_ndbcluster= 0; $opt_skip_ndbcluster= 0;