database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-04 01:23:45 +03:00
Code Activity

MDEV-12785 MTR complains "Can't exec mariadb_config"

Browse Source 
Adjust search paths for mariadb_config and make further assignment
conditional
This commit is contained in:
Elena Stepanova
2017-07-09 20:36:19 +03:00
parent 51256b603a
commit 970719cb15
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2280,10 +2280,15 @@ sub environment_setup {
$ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded; $ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded;
my $client_config_exe= my $client_config_exe=
native_path("$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config"); mtr_exe_maybe_exists(
"$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config",
"$bindir/bin/mariadb_config");
if ($client_config_exe)
{
my $tls_info= `$client_config_exe --tlsinfo`; my $tls_info= `$client_config_exe --tlsinfo`;
($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})= ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
split(/ /, $tls_info, 2); split(/ /, $tls_info, 2);
}
my $exe_mysqld= find_mysqld($basedir); my $exe_mysqld= find_mysqld($basedir);
$ENV{'MYSQLD'}= $exe_mysqld; $ENV{'MYSQLD'}= $exe_mysqld;
my $extra_opts= join (" ", @opt_extra_mysqld_opt); my $extra_opts= join (" ", @opt_extra_mysqld_opt);