Commit 445a5545 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/mysql-test-run.pl:
  Auto merged
parents 51f19343 bd1f1d98

mysql-test/mysql-test-run.pl

+4 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,10 @@ skip-innodb 
skip-ndbcluster

EOF

;



    if ( $mysql_version_id < 50100 )

    {

      print OUT "skip-bdb\n";

    }

    print OUT "nonguarded\n" if $instance->{'nonguarded'};

    if ( $mysql_version_id >= 50100 )

    {