Skip to content

Commit 68f2ec9

Browse files
committed
MODULES-3907 Add MySQL/Percona 5.7 initialize on fresh deploy
1 parent dcd7635 commit 68f2ec9

File tree

1 file changed

+2
-2
lines changed
  • lib/puppet/provider/mysql_datadir

1 file changed

+2
-2
lines changed

lib/puppet/provider/mysql_datadir/mysql.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ def create
4747
if (mysqld_type == "mysql" or mysqld_type == "percona") and Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0
4848
debug("Initializing MySQL data directory >= 5.7.6 with 'mysqld #{defaults_extra_file} #{initialize} --basedir=#{basedir} --datadir=#{datadir} --user=#{user}'")
4949
opts<<"--log-error=#{log_error}"
50+
opts<<"#{initialize}"
5051
mysqld(opts.compact)
5152
else
5253
debug("Installing MySQL data directory with mysql_install_db #{defaults_extra_file} --basedir=#{basedir} --datadir=#{datadir} --user=#{user}")
@@ -64,7 +65,7 @@ def destroy
6465
6566
def exists?
6667
datadir = @resource[:datadir]
67-
(File.directory?("#{datadir}/mysql")) && (Dir.entries("#{datadir}/mysql") - %w{ . .. }).any?
68+
(File.directory?("#{datadir}/mysql")) && (Dir.entries("#{datadir}/mysql") - %w{ . .. }).any?
6869
end
6970
7071
##
@@ -75,4 +76,3 @@ def exists?
7576
mk_resource_methods
7677
7778
end
78-

0 commit comments

Comments
 (0)