database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

merge from 5.1 main

Browse Source
This commit is contained in:
Bjorn Munch
2009-05-29 13:04:02 +02:00
parent 763579e65b d4b11c0990
commit 524bd596e2
185 changed files with 3344 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,7 +898,8 @@ sub collect_one_test_case {
if ( $tinfo->{'innodb_test'} )
{
# This is a test that need innodb
if ( $::mysqld_variables{'innodb'} ne "TRUE" )
if ( $::mysqld_variables{'innodb'} eq "OFF" ||
! exists $::mysqld_variables{'innodb'} )
{
# innodb is not supported, skip it
$tinfo->{'skip'}= 1;