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

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
This commit is contained in:
unknown
2008-03-10 16:42:04 +01:00
parent 91df8771c3 18c62e62ed
commit 27c7181d98
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,7 +820,7 @@ sub collect_one_test_case {
if ( $tinfo->{'ndb_test'} )
{
# This is a NDB test
if ( ! $::glob_ndbcluster_supported )
if ( $::opt_skip_ndbcluster == 2 )
{
# Ndb is not supported, skip it
$tinfo->{'skip'}= 1;
@ -969,6 +969,7 @@ my @tags=
["include/have_ndb_extra.inc", "ndb_extra", 1],
["include/master-slave.inc", "rpl_test", 1],
["include/ndb_master-slave.inc", "rpl_test", 1],
["include/ndb_master-slave.inc", "ndb_test", 1],
["include/federated.inc", "federated_test", 1],
["include/not_embedded.inc", "not_embedded", 1],
);