Skip to content

Commit ead6505

Browse files
committed
Fix not to touch innodb_file_per_table as it's always enabled by default
1 parent fb75661 commit ead6505

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

lib/Virtualmin/Config/Plugin/MySQL.pm

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sub actions {
3636

3737
$self->spin();
3838
eval {
39-
foreign_require("init", "init-lib.pl");
39+
foreign_require("init");
4040
if (init::action_status("mariadb")) {
4141
init::enable_at_boot("mariadb");
4242
}
@@ -46,17 +46,10 @@ sub actions {
4646
else {
4747
init::enable_at_boot("mysqld");
4848
}
49-
foreign_require("mysql", "mysql-lib.pl");
50-
if (mysql::is_mysql_running()) {
51-
mysql::stop_mysql();
49+
foreign_require("mysql");
50+
if (!mysql::is_mysql_running()) {
51+
mysql::start_mysql();
5252
}
53-
my $conf = mysql::get_mysql_config();
54-
my ($sect) = grep { $_->{'name'} eq 'mysqld' } @$conf;
55-
if ($sect) {
56-
mysql::save_directive($conf, $sect, "innodb_file_per_table", [1]);
57-
flush_file_lines($sect->{'file'});
58-
}
59-
my $err = mysql::start_mysql();
6053
$self->done(1);
6154
};
6255
if ($@) {

0 commit comments

Comments
 (0)