File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -2280,10 +2280,15 @@ sub environment_setup {
2280
2280
$ENV {' MYSQL_EMBEDDED' }= $exe_mysql_embedded ;
2281
2281
2282
2282
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
+ }
2287
2292
my $exe_mysqld = find_mysqld($basedir );
2288
2293
$ENV {' MYSQLD' }= $exe_mysqld ;
2289
2294
my $extra_opts = join (" " , @opt_extra_mysqld_opt );
You can’t perform that action at this time.
0 commit comments