Commit 143b0e4f 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/mysql-test-run.pl:
  Auto merged
parents c4034fb5 a797e75a

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -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;