michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Most options have moved away from set-variable

Browse Source 
https://github.com/webmin/webmin/issues/2497
This commit is contained in:
Jamie Cameron
2025-06-19 21:21:47 -07:00
parent 01867c86e0
commit b397ece0ab
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql/mysql-lib.pl
View File

@@ -88,20 +88,13 @@ if ($mysql_version =~ /mariadb/i) {
}
&fix_mysql_text(\%text);
if (&compare_version_numbers($mysql_version, "5.5") >= 0) {
@mysql_set_variables = ( "key_buffer_size", "sort_buffer_size",
"net_buffer_length" );
}
else {
@mysql_set_variables = ( "key_buffer", "sort_buffer",
"net_buffer_length" );
}
if (&compare_version_numbers($mysql_version, "5.6") >= 0) {
@mysql_number_variables = ( "table_open_cache", "max_connections" );
}
else {
@mysql_number_variables = ( "table_cache", "max_connections" );
}
@mysql_byte_variables = ( "max_allowed_packet" );
my $mysql8_optout = &compare_version_numbers($mysql_version, "8.0") >= 0 && $mysql_version !~ /maria/i;
if (!$mysql8_optout) {
@@ -115,6 +108,15 @@ else {
push(@mysql_set_variables, "myisam_sort_buffer_size");
}
if (&compare_version_numbers($mysql_version, "5.5") >= 0) {
push(@mysql_byte_variables, "key_buffer_size", "sort_buffer_size",
"net_buffer_length");
}
else {
@mysql_set_variables = ( "key_buffer", "sort_buffer",
"net_buffer_length" );
}
# make_authstr([login], [pass], [host], [port], [sock], [unix-user], [ssl])
# Returns a string to pass to MySQL commands to login to the database
sub make_authstr