1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add and use a function to save the MySQL version number

Browse Source
This commit is contained in:
Jamie Cameron 2016-12-26 21:11:11 -08:00
parent ad381d1447
commit 1fd2f398ad
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mysql/mysql-lib.pl
View File

@ -27,10 +27,8 @@ if ($module_info{'usermin'}) {
$mysql_login = $userconfig{'login'}; $mysql_login = $userconfig{'login'};
$mysql_pass = $userconfig{'pass'}; $mysql_pass = $userconfig{'pass'};
} }
if (open(VERSION, "$user_module_config_directory/version")) { chop($mysql_version = &read_file_contents(
chop($mysql_version = <VERSION>); "$user_module_config_directory/version"));
close(VERSION);
}
$max_dbs = $userconfig{'max_dbs'}; $max_dbs = $userconfig{'max_dbs'};
$commands_file = "$user_module_config_directory/commands"; $commands_file = "$user_module_config_directory/commands";
$sql_charset = $userconfig{'charset'}; $sql_charset = $userconfig{'charset'};
@ -48,13 +46,9 @@ else {
$mysql_login = $config{'login'}; $mysql_login = $config{'login'};
$mysql_pass = $config{'pass'}; $mysql_pass = $config{'pass'};
} }
if (open(VERSION, "$module_config_directory/version")) { chop($mysql_version = &read_file_contents(
chop($mysql_version = <VERSION>); "$module_config_directory/version"));
close(VERSION); $mysql_version ||= &get_mysql_version();
}
else {
$mysql_version = &get_mysql_version();
}
$cron_cmd = "$module_config_directory/backup.pl"; $cron_cmd = "$module_config_directory/backup.pl";
$max_dbs = $config{'max_dbs'}; $max_dbs = $config{'max_dbs'};
$commands_file = "$module_config_directory/commands"; $commands_file = "$module_config_directory/commands";
@ -815,6 +809,19 @@ return -1 if (!@{$data->{'data'}});
return $data->{'data'}->[0]->[0]; return $data->{'data'}->[0]->[0];
} }
# save_mysql_version([number])
# Update the saved local MySQL version number
sub save_mysql_version
{
local ($ver) = @_;
$ver ||= &get_mysql_version();
if ($ver) {
&open_tempfile(VERSION, ">$module_config_directory/version");
&print_tempfile(VERSION, $ver,"\n");
&close_tempfile(VERSION);
}
}
# date_subs(filename) # date_subs(filename)
# Does strftime-style date substitutions on a filename, if enabled # Does strftime-style date substitutions on a filename, if enabled
sub date_subs sub date_subs