← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysql-test/lib/mtr_cases.pl

  • Committer: Stewart Smith
  • Date: 2008-06-30 06:46:40 UTC
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: stewart@flamingspork.com-20080630064640-1tbyi1e8j4duba45
no embedded server, stop testing for it in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/lib/mtr_cases.pl
801
801
      return;
802
802
    }
803
803
 
804
 
    {
 
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
805
827
      if ( $::opt_with_ndbcluster_only )
806
828
      {
807
829
        # Only the ndb test should be run, all other should be skipped
811
833
      }
812
834
    }
813
835
 
 
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
 
814
848
    if ( $tinfo->{'need_binlog'} )
815
849
    {
816
850
      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
852
886
  "sup_binlog_formats", ["row","statement"]],
853
887
 ["include/big_test.inc", "big_test", 1],
854
888
 ["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],
855
893
 ["require_manager", "require_manager", 1],
856
894
);
857
895