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

merge with mysql-5.5.30 minus few incorrect or not applicable changesets

Browse Source
This commit is contained in:
Sergei Golubchik
2013-02-28 18:42:49 +01:00
parent 154aac8eb0 31c06437c9
commit 8161c6772d
178 changed files with 3572 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/mtr_cases.pm
View File

@ -769,18 +769,11 @@ sub collect_one_test_case {
if ( $tinfo->{'ndb_test'} )
{
# This is a NDB test
if ( $::opt_skip_ndbcluster == 2 )
if ( $::ndbcluster_enabled == 0)
{
# Ndb is not supported, skip it
# ndbcluster is disabled
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
return $tinfo;
}
elsif ( $::opt_skip_ndbcluster )
{
# All ndb test's should be skipped
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No ndbcluster";
$tinfo->{'comment'}= "ndbcluster disabled";
return $tinfo;
}
}