Merge pull request #871 from dn1s/mysqluser_char_length

MODULES-3697 Changed puppet fail behaviour for mysql create user and grant if user name is longer than 16 chars

Author: bmjen

lib/puppet/type/mysql_grant.rb

@@ -80,8 +80,10 @@ def initialize(*args)
 
       mysql_version = Facter.value(:mysql_version)
       unless mysql_version.nil?
-        if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 and user_part.size > 16
+        if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 and user_part.size > 16
           raise(ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters')
+        elsif Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 and user_part.size > 32
+          raise(ArgumentError, 'MySQL usernames are limited to a maximum of 32 characters')
         elsif Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 and user_part.size > 80
           raise(ArgumentError, 'MySQL usernames are limited to a maximum of 80 characters')
         end

lib/puppet/type/mysql_user.rb

@@ -29,8 +29,10 @@
 
       mysql_version = Facter.value(:mysql_version)
       unless mysql_version.nil?
-        if Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 and user_part.size > 16
+        if Puppet::Util::Package.versioncmp(mysql_version, '5.7.8') < 0 and user_part.size > 16
           raise(ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters')
+        elsif Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') < 0 and user_part.size > 32
+          raise(ArgumentError, 'MySQL usernames are limited to a maximum of 32 characters')
         elsif Puppet::Util::Package.versioncmp(mysql_version, '10.0.0') > 0 and user_part.size > 80
           raise(ArgumentError, 'MySQL usernames are limited to a maximum of 80 characters')
         end