Merge pull request #133 from obilodeau/master

fixed character-set detection regex

Author: hunner

lib/puppet/provider/database/mysql.rb

@@ -22,7 +22,7 @@ def destroy
   end
 
   def charset
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "show create database `#{resource[:name]}`").match(/.*?(\S+)\s\*\//)[1]
+    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "show create database `#{resource[:name]}`").match(/.*?(\S+)\s(?:COLLATE.*)?\*\//)[1]
   end
 
   def charset=(value)