summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-07 16:17:04 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-07 16:17:04 +0100
commit143b0e4fb77079e5f8f49b3f78363a12f1c1b25a (patch)
treef3cb8757d02dd81f7d0fabadbb5558e678fea326
parentc4034fb5e3f4049739fe1e67faca9d5bb132a4ca (diff)
parenta797e75a3eeff27e61ae6fbcdb6488b19d8747d6 (diff)
downloadmariadb-git-143b0e4fb77079e5f8f49b3f78363a12f1c1b25a.tar.gz
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
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 968c4199cd3..c3b23781c56 100755
--- 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;