Merge branch 'master' of github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2021-01-04 20:21:52 -08:00

View File

@@ -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" );