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

mysql-test/mysql-test-run.pl

@@ -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 )
     {