From 371be571af50c45b1cbe654d239d3aaf2ae9f39e Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sat, 2 Jan 2021 14:09:26 +0300 Subject: [PATCH] Display MariaDB name for module if used 1/2 https://github.com/webmin/webmin/issues/1421 --- mysql/mysql-lib.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl index 31d64ba04..e6a3e5c88 100755 --- a/mysql/mysql-lib.pl +++ b/mysql/mysql-lib.pl @@ -4,6 +4,7 @@ BEGIN { push(@INC, ".."); }; use WebminCore; &init_config(); + require 'view-lib.pl'; if ($config{'mysql_libs'}) { $ENV{$gconfig{'ld_env'}} .= ':' if ($ENV{$gconfig{'ld_env'}}); @@ -75,6 +76,11 @@ use DBI; EOF } +my ($rver, $rvariant) = &get_remote_mysql_variant(); +if ($rvariant ne 'mysql') { + $text = map { $text{$_} =~ s/MySQL/MariaDB/g } %text; + } + if (&compare_version_numbers($mysql_version, "5.5") >= 0) { @mysql_set_variables = ( "key_buffer_size", "sort_buffer_size", "net_buffer_length" );