Merge pull request #605 from slamont/master

Proper containment for mysql::client in mysql::db