Commit 060f4196 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
parents e6440d13 5decebc5
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -554,6 +554,18 @@ sub collect_one_test_case($$$$$$$) {
      }
    }

    if ( $tinfo->{'innodb_test'} )
    {
      # This is a test that need inndob
      if ( $::mysqld_variables{'innodb'} eq "FALSE" )
      {
	# innodb is not supported, skip it
	$tinfo->{'skip'}= 1;
	$tinfo->{'comment'}= "No innodb support";
	return;
      }
    }

  }
}