Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #133 from obilodeau/master

fixed character-set detection regex
  • Loading branch information...
commit 4af7950cb79e5da8fa99b022cfcf02018891ba98 2 parents d5bf7a1 + 8510a41
@hunner hunner authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/puppet/provider/database/mysql.rb
View
2  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)
Please sign in to comment.
Something went wrong with that request. Please try again.