← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/lib/mtr_cases.pm
964
964
  if ( $tinfo->{'ndb_test'} )
965
965
  {
966
966
    # This is a NDB test
967
 
    if ( $::opt_skip_ndbcluster == 2 )
968
 
    {
969
 
      # Ndb is not supported, skip it
970
 
      $tinfo->{'skip'}= 1;
971
 
      $tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
972
 
      return $tinfo;
973
 
    }
974
 
    elsif ( $::opt_skip_ndbcluster )
975
 
    {
976
 
      # All ndb test's should be skipped
977
 
      $tinfo->{'skip'}= 1;
978
 
      $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
 
967
    if ( $::ndbcluster_enabled == 0)
 
968
    {
 
969
      # ndbcluster is disabled
 
970
      $tinfo->{'skip'}= 1;
 
971
      $tinfo->{'comment'}= "ndbcluster disabled";
979
972
      return $tinfo;
980
973
    }
981
974
  }