Repair this by ensuring calls to mysql include the database name.

A prior commit accidently broke this, meaning that mysql_database
was querying the mysql defaults instead of each individual database
when trying to determine the current collate settings.
Fixes for Ubuntu/Debian.
Fix this test for Debian.  This is a total hack for now.
Merge branch '2.2.x' of https://github.com/puppetlabs/puppetlabs-mysql into 2.2.x
Merge branch 'master' into 2.2.x
Fix the case of this, ARGH.
Merge pull request #465 from apenney/wel-now

Fix the case of this, ARGH.
As we're deleting /etc/my.cnf, lets not restart MySQL in the middle
of this and cause a terrible explosion.
Merge pull request #466 from apenney/wel-now

As we're deleting /etc/my.cnf, lets not restart MySQL in the middle