Skip to content

Commit 970719c

Browse files
committed
MDEV-12785 MTR complains "Can't exec mariadb_config"
Adjust search paths for mariadb_config and make further assignment conditional
1 parent 51256b6 commit 970719c

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,10 +2280,15 @@ sub environment_setup {
22802280
$ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded;
22812281

22822282
my $client_config_exe=
2283-
native_path("$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config");
2284-
my $tls_info= `$client_config_exe --tlsinfo`;
2285-
($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
2286-
split(/ /, $tls_info, 2);
2283+
mtr_exe_maybe_exists(
2284+
"$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config",
2285+
"$bindir/bin/mariadb_config");
2286+
if ($client_config_exe)
2287+
{
2288+
my $tls_info= `$client_config_exe --tlsinfo`;
2289+
($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
2290+
split(/ /, $tls_info, 2);
2291+
}
22872292
my $exe_mysqld= find_mysqld($basedir);
22882293
$ENV{'MYSQLD'}= $exe_mysqld;
22892294
my $extra_opts= join (" ", @opt_extra_mysqld_opt);

0 commit comments

Comments
 (0)