database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
This commit is contained in:
unknown
2005-09-19 15:31:09 +02:00
parent a615084fa4 5df7f93ddf
commit 730fc4156d
3 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/mysql-test-run.pl
View File

@ -262,6 +262,7 @@ our $opt_user;
our $opt_user_test;
our $opt_valgrind;
our $opt_valgrind_mysqltest;
our $opt_valgrind_all;
our $opt_valgrind_options;
@ -524,6 +525,7 @@ sub command_line_setup () {
'gcov' => \$opt_gcov,
'gprof' => \$opt_gprof,
'valgrind:s' => \$opt_valgrind,
'valgrind-mysqltest:s' => \$opt_valgrind_mysqltest,
'valgrind-all:s' => \$opt_valgrind_all,
'valgrind-options=s' => \$opt_valgrind_options,
@ -708,9 +710,15 @@ sub command_line_setup () {
# "" option set with no argument
# "somestring" option is name/path of valgrind executable
if ( defined $opt_valgrind_all and ! $opt_valgrind )
# Take executable path from any of them, if any
$opt_valgrind= $opt_valgrind_mysqltest if $opt_valgrind_mysqltest;
$opt_valgrind= $opt_valgrind_all if $opt_valgrind_all;
# If valgrind flag not defined, define if other valgrind flags are
unless ( defined $opt_valgrind )
{
$opt_valgrind= $opt_valgrind_all;
$opt_valgrind= ""
if defined $opt_valgrind_mysqltest or defined $opt_valgrind_all;
}
if ( ! $opt_testcase_timeout )
@ -2392,7 +2400,7 @@ sub run_mysqltest ($) {
mtr_init_args(\$args);
if ( defined $opt_valgrind )
if ( defined $opt_valgrind_mysqltest )
{
valgrind_arguments($args, \$exe);
}
@ -2501,6 +2509,8 @@ sub valgrind_arguments {
mtr_add_arg($args, "--alignment=8");
mtr_add_arg($args, "--leak-check=yes");
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";
if ( defined $opt_valgrind_all )
{
@ -2584,10 +2594,11 @@ Options for coverage, profiling etc
gcov FIXME
gprof FIXME
valgrind[=exe] Run the "mysqltest" executable as well as the "mysqld"
valgrind[=EXE] Run the "mysqltest" executable as well as the "mysqld"
server using valgrind, optionally specifying the
executable path/name
valgrind-all FIXME
valgrind-mysqltest[=EXE] In addition, run the "mysqltest" executable with valgrind
valgrind-all[=EXE] Adds verbose flag, and --show-reachable to valgrind
valgrind-options=ARGS Extra options to give valgrind
Misc options