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

mtr+valgrind: fix jemalloc check to work correctly for bundler and system jemalloc

Browse Source
This commit is contained in:
Sergei Golubchik
2015-01-19 14:07:22 +01:00
parent 2877c5ecc2
commit f78078a840
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6187,7 +6187,6 @@ sub debugger_arguments {
} }
} }
# #
# Modify the exe and args so that program is run in valgrind # Modify the exe and args so that program is run in valgrind
# #
@ -6209,10 +6208,14 @@ sub valgrind_arguments {
if -f "$glob_mysql_test_dir/valgrind.supp"; if -f "$glob_mysql_test_dir/valgrind.supp";
# Ensure the jemalloc works with mysqld # Ensure the jemalloc works with mysqld
if ($mysqld_variables{'version-malloc-library'} ne "system" && if ($$exe =~ /mysqld/)
$$exe =~ /mysqld/)
{ {
mtr_add_arg($args, "--soname-synonyms=somalloc=NONE" ); my %somalloc=(
'system jemalloc' => 'libjemalloc*',
'bundled jemalloc' => 'NONE'
);
my ($syn) = $somalloc{$mysqld_variables{'version-malloc-library'}};
mtr_add_arg($args, '--soname-synonyms=somalloc=%s', $syn) if $syn;
} }
} }