Skip to content

Commit 886870e

Browse files
Merge pull request #1307 from unipartdigital/fixes
Use ALTER USER for mariadb 10.2.0 or newer
2 parents de57cd0 + 58ddd2b commit 886870e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/puppet/provider/mysql_user/mysql.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def plugin=(string)
211211
sql << ", authentication_string = '#{@resource[:password_hash]}'"
212212
sql << " where CONCAT(user, '@', host) = '#{concat_name}'; FLUSH PRIVILEGES"
213213
end
214-
elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6')
214+
elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0')
215215
sql = "ALTER USER #{merged_name} IDENTIFIED WITH '#{string}'"
216216
sql << " AS '#{@resource[:password_hash]}'" if string == 'mysql_native_password'
217217
else

0 commit comments

Comments
 (0)