← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/mtr_cases.pl

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/mtr_cases.pl
801
801
      return;
802
802
    }
803
803
 
804
 
    if ( $tinfo->{'ndb_test'} )
805
 
    {
806
 
      # This is a NDB test
807
 
      if ( ! $::glob_ndbcluster_supported )
808
 
      {
809
 
        # Ndb is not supported, skip it
810
 
        $tinfo->{'skip'}= 1;
811
 
        $tinfo->{'comment'}= "No ndbcluster support";
812
 
        return;
813
 
      }
814
 
      elsif ( $::opt_skip_ndbcluster )
815
 
      {
816
 
        # All ndb test's should be skipped
817
 
        $tinfo->{'skip'}= 1;
818
 
        $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
819
 
        return;
820
 
      }
821
 
      # Ndb tests run with two mysqld masters
822
 
      $tinfo->{'master_num'}= 2;
823
 
    }
824
 
    else
825
 
    {
826
 
      # This is not a ndb test
 
804
    {
827
805
      if ( $::opt_with_ndbcluster_only )
828
806
      {
829
807
        # Only the ndb test should be run, all other should be skipped
833
811
      }
834
812
    }
835
813
 
836
 
    if ( $tinfo->{'innodb_test'} )
837
 
    {
838
 
      # This is a test that need innodb
839
 
      if ( $::mysqld_variables{'innodb'} ne "TRUE" )
840
 
      {
841
 
        # innodb is not supported, skip it
842
 
        $tinfo->{'skip'}= 1;
843
 
        $tinfo->{'comment'}= "No innodb support";
844
 
        return;
845
 
      }
846
 
    }
847
 
 
848
814
    if ( $tinfo->{'need_binlog'} )
849
815
    {
850
816
      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
886
852
  "sup_binlog_formats", ["row","statement"]],
887
853
 ["include/big_test.inc", "big_test", 1],
888
854
 ["include/have_debug.inc", "need_debug", 1],
889
 
 ["include/have_ndb.inc", "ndb_test", 1],
890
 
 ["include/have_multi_ndb.inc", "ndb_test", 1],
891
 
 ["include/have_ndb_extra.inc", "ndb_extra", 1],
892
 
 ["include/ndb_master-slave.inc", "ndb_test", 1],
893
855
 ["require_manager", "require_manager", 1],
894
856
);
895
857