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

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

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
ad63d2bd · msvensson@neptunus.(none) · ffa100d2 · f5550c33 · ad63d2bd
Commit ad63d2bd authored Nov 07, 2006 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +5 -0

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3361,6 +3361,11 @@ sub mysqld_arguments ($$$$$) {
  if ( $opt_valgrind_mysqld )
  {
    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
+
+    if ( $mysql_version_id < 50100 )
+    {
+      mtr_add_arg($args, "%s--skip-bdb", $prefix);
+    }
  }

  my $pidfile;