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

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-27 17:45:06 +03:00
parent 774dee9abc 135e976696
commit 71a1a28a49
68 changed files with 1775 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mariadb-test-run.pl
View File

@@ -1794,7 +1794,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);