1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.11 into 11.0

This commit is contained in:
Marko Mäkelä
2023-06-28 09:19:19 +03:00
72 changed files with 1787 additions and 1022 deletions

View File

@@ -1796,7 +1796,7 @@ sub collect_mysqld_features {
sub collect_mysqld_features_from_running_server ()
{
my $mysql= mtr_exe_exists("$path_client_bindir/mysql");
my $mysql= mtr_exe_exists("$path_client_bindir/mariadb");
my $args;
mtr_init_args(\$args);