1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Automatic merge

This commit is contained in:
Michael Widenius
2014-02-05 19:23:11 +02:00
141 changed files with 3032 additions and 827 deletions

View File

@ -6188,6 +6188,13 @@ sub valgrind_arguments {
mtr_add_arg($args, "--num-callers=16");
mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)
if -f "$glob_mysql_test_dir/valgrind.supp";
# Ensure the jemalloc works with mysqld
if ($mysqld_variables{'version-malloc-library'} ne "system" &&
$$exe =~ /mysqld/)
{
mtr_add_arg($args, "--soname-synonyms=somalloc=NONE" );
}
}
# Add valgrind options, can be overriden by user
@ -6318,7 +6325,20 @@ sub usage ($) {
$0 [ OPTIONS ] [ TESTCASE ]
Options to control what engine/variation to run
Where test case can be specified as:
testcase[.test] Runs the test case named 'testcase' from all suits
path-to-testcase
[suite.]testcase[,combination]
Examples:
alias
main.alias 'main' is the name of the suite for the 't' directory.
rpl.rpl_invoked_features,mix,xtradb_plugin
suite/rpl/t/rpl.rpl_invoked_features
Options to control what engine/variation to run:
embedded-server Use the embedded server, i.e. no mysqld daemons
ps-protocol Use the binary protocol between client and server