Merge branch 'master' of git://git.puppet.immerda.ch/module-mysql

Conflicts:
	files/scripts/optimize_tables.rb
	manifests/server/base.pp

2 files changed, 1 insertions, 3 deletions

diff --git a/lib/puppet/type/mysql_grant.rb b/lib/puppet/type/mysql_grant.rb
index c6311e5..e61f429 100644
--- a/lib/puppet/type/mysql_grant.rb
+++ b/lib/puppet/type/mysql_grant.rb
@@ -43,7 +43,7 @@ Puppet::Type.newtype(:mysql_grant) do
   newproperty(:privileges, :array_matching => :all) do
     desc "The privileges the user should have. The possible values are implementation dependent."
     munge do |v|
-      symbolize(v)
+      v.intern
     end
 
     def should_to_s(newvalue = @should)
diff --git a/lib/puppet/type/mysql_user.rb b/lib/puppet/type/mysql_user.rb
index 0b7e9af..7d41890 100644
--- a/lib/puppet/type/mysql_user.rb
+++ b/lib/puppet/type/mysql_user.rb
@@ -12,8 +12,6 @@ Puppet::Type.newtype(:mysql_user) do
       if value.split('@').first.size > 16
         raise ArgumentError,
               "MySQL usernames are limited to a maximum of 16 characters"
-      else
-        super
       end
     end
   end