diff --git a/lib/puppet/provider/database/mysql.rb b/lib/puppet/provider/database/mysql.rb
index 469fe9b..a323835 100644
--- a/lib/puppet/provider/database/mysql.rb
+++ b/lib/puppet/provider/database/mysql.rb
@@ -1,42 +1,52 @@
 Puppet::Type.type(:database).provide(:mysql) do
-
   desc "Manages MySQL database."
 
   defaultfor :kernel => 'Linux'
 
   optional_commands :mysql      => 'mysql'
   optional_commands :mysqladmin => 'mysqladmin'
 
+  def self.defaults_file
+    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
+    else
+      nil
+    end
+  end
+
+  def defaults_file
+    self.class.defaults_file
+  end
+
   def self.instances
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "show databases").split("\n").collect do |name|
+    mysql([defaults_file, '-NBe', "show databases"].compact).split("\n").collect do |name|
       new(:name => name)
     end
   end
 
   def create
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "create database `#{@resource[:name]}` character set #{resource[:charset]}")
+    mysql([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{resource[:charset]}"].compact)
   end
 
   def destroy
-    mysqladmin("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-f', 'drop', @resource[:name])
+    mysqladmin([defaults_file, '-f', 'drop', @resource[:name]].compact)
   end
 
   def charset
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "show create database `#{resource[:name]}`").match(/.*?(\S+)\s(?:COLLATE.*)?\*\//)[1]
+    mysql([defaults_file, '-NBe', "show create database `#{resource[:name]}`"].compact).match(/.*?(\S+)\s(?:COLLATE.*)?\*\//)[1]
   end
 
   def charset=(value)
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}")
+    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact)
   end
 
   def exists?
     begin
-      mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", '-NBe', "show databases").match(/^#{@resource[:name]}$/)
+      mysql([defaults_file, '-NBe', "show databases"].compact).match(/^#{@resource[:name]}$/)
     rescue => e
       debug(e.message)
       return nil
     end
   end
 
 end
-
diff --git a/lib/puppet/provider/database_grant/mysql.rb b/lib/puppet/provider/database_grant/mysql.rb
index 8651539..3989e1f 100644
--- a/lib/puppet/provider/database_grant/mysql.rb
+++ b/lib/puppet/provider/database_grant/mysql.rb
@@ -1,198 +1,210 @@
 # A grant is either global or per-db. This can be distinguished by the syntax
 # of the name:
 #   user@host => global
 #   user@host/db => per-db
 
 Puppet::Type.type(:database_grant).provide(:mysql) do
 
   desc "Uses mysql as database."
 
   defaultfor :kernel => 'Linux'
 
   optional_commands :mysql      => 'mysql'
   optional_commands :mysqladmin => 'mysqladmin'
 
   def self.prefetch(resources)
     @user_privs = query_user_privs
     @db_privs = query_db_privs
   end
 
   def self.user_privs
     @user_privs || query_user_privs
   end
 
   def self.db_privs
     @db_privs || query_db_privs
   end
 
   def user_privs
     self.class.user_privs
   end
 
   def db_privs
     self.class.db_privs
   end
 
   def self.query_user_privs
-    results = mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-Be", "describe user")
+    results = mysql([defaults_file, "mysql", "-Be", "describe user"].compact)
     column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
     @user_privs = column_names.delete_if { |e| !( e =~/_priv$/) }
   end
 
   def self.query_db_privs
-    results = mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-Be", "describe db")
+    results = mysql([defaults_file, "mysql", "-Be", "describe db"].compact)
     column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
     @db_privs = column_names.delete_if { |e| !(e =~/_priv$/) }
   end
 
   def mysql_flush
-    mysqladmin "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "flush-privileges"
+    mysqladmin([defaults_file, "flush-privileges"].compact)
   end
 
   # this parses the
   def split_name(string)
     matches = /^([^@]*)@([^\/]*)(\/(.*))?$/.match(string).captures.compact
     case matches.length
     when 2
       {
         :type => :user,
         :user => matches[0],
         :host => matches[1]
       }
     when 4
       {
         :type => :db,
         :user => matches[0],
         :host => matches[1],
         :db => matches[3]
       }
     end
   end
 
   def create_row
     unless @resource.should(:privileges).empty?
       name = split_name(@resource[:name])
       case name[:type]
       when :user
-        mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
+        mysql([defaults_file, "mysql", "-e", "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
           name[:host], name[:user],
-        ]
+        ]].compact)
       when :db
-        mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
+        mysql([defaults_file, "mysql", "-e", "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
           name[:host], name[:user], name[:db],
-        ]
+        ]].compact)
       end
       mysql_flush
     end
   end
 
   def destroy
-    mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]
+    mysql([defaults_file, "mysql", "-e", "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]].compact)
   end
 
   def row_exists?
     name = split_name(@resource[:name])
     fields = [:user, :host]
     if name[:type] == :db
       fields << :db
     end
-    not mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", '-NBe', 'SELECT "1" FROM %s WHERE %s' % [ name[:type], fields.map do |f| "%s=\"%s\"" % [f, name[f]] end.join(' AND ')]).empty?
+    not mysql([defaults_file, "mysql", '-NBe', 'SELECT "1" FROM %s WHERE %s' % [ name[:type], fields.map do |f| "%s=\"%s\"" % [f, name[f]] end.join(' AND ')]].compact).empty?
   end
 
   def all_privs_set?
     all_privs = case split_name(@resource[:name])[:type]
                 when :user
                   user_privs
                 when :db
                   db_privs
                 end
     all_privs = all_privs.collect do |p| p.downcase end.sort.join("|")
     privs = privileges.collect do |p| p.downcase end.sort.join("|")
 
     all_privs == privs
   end
 
   def privileges
     name = split_name(@resource[:name])
     privs = ""
 
     case name[:type]
     when :user
-      privs = mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-Be", 'select * from mysql.user where user="%s" and host="%s"' % [ name[:user], name[:host] ]
+      privs = mysql([defaults_file, "mysql", "-Be", 'select * from mysql.user where user="%s" and host="%s"' % [ name[:user], name[:host] ]].compact)
     when :db
-      privs = mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-Be", 'select * from mysql.db where user="%s" and host="%s" and db="%s"' % [ name[:user], name[:host], name[:db] ]
+      privs = mysql([defaults_file, "mysql", "-Be", 'select * from mysql.db where user="%s" and host="%s" and db="%s"' % [ name[:user], name[:host], name[:db] ]].compact)
     end
 
     if privs.match(/^$/)
       privs = [] # no result, no privs
     else
       # returns a line with field names and a line with values, each tab-separated
       privs = privs.split(/\n/).map! do |l| l.chomp.split(/\t/) end
       # transpose the lines, so we have key/value pairs
       privs = privs[0].zip(privs[1])
       privs = privs.select do |p| p[0].match(/_priv$/) and p[1] == 'Y' end
     end
 
     privs.collect do |p| p[0] end
   end
 
   def privileges=(privs)
     unless row_exists?
       create_row
     end
 
     # puts "Setting privs: ", privs.join(", ")
     name = split_name(@resource[:name])
     stmt = ''
     where = ''
     all_privs = []
     case name[:type]
     when :user
       stmt = 'update user set '
       where = ' where user="%s" and host="%s"' % [ name[:user], name[:host] ]
       all_privs = user_privs
     when :db
       stmt = 'update db set '
       where = ' where user="%s" and host="%s" and db="%s"' % [ name[:user], name[:host], name[:db] ]
       all_privs = db_privs
     end
 
     if privs[0].downcase == 'all'
       privs = all_privs
     end
 
     # Downcase the requested priviliges for case-insensitive selection
     # we don't map! here because the all_privs object has to remain in
     # the same case the DB gave it to us in
     privs = privs.map { |p| p.downcase }
 
     # puts "stmt:", stmt
     set = all_privs.collect do |p| "%s = '%s'" % [p, privs.include?(p.downcase) ? 'Y' : 'N'] end.join(', ')
     # puts "set:", set
     stmt = stmt << set << where
 
     validate_privs privs, all_privs
-    mysql "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-Be", stmt
+    mysql([defaults_file, "mysql", "-Be", stmt].compact)
     mysql_flush
   end
 
   def validate_privs(set_privs, all_privs)
     all_privs = all_privs.collect { |p| p.downcase }
     set_privs = set_privs.collect { |p| p.downcase }
     invalid_privs = Array.new
     hints = Array.new
     # Test each of the user provided privs to see if they exist in all_privs
     set_privs.each do |priv|
       invalid_privs << priv unless all_privs.include?(priv)
       hints << "#{priv}_priv" if all_privs.include?("#{priv}_priv")
     end
     unless invalid_privs.empty?
       # Print a decently helpful and gramatically correct error message
       hints = "Did you mean '#{hints.join(',')}'?" unless hints.empty?
       p = invalid_privs.size > 1 ? ['s', 'are not valid'] : ['', 'is not valid']
       detail = ["The privilege#{p[0]} '#{invalid_privs.join(',')}' #{p[1]}."]
       fail [detail, hints].join(' ')
     end
   end
 
+  # Optional defaults file
+  def self.defaults_file
+    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
+    else
+      nil
+    end
+  end
+  def defaults_file
+    self.class.defaults_file
+  end
+
 end
diff --git a/lib/puppet/provider/database_user/mysql.rb b/lib/puppet/provider/database_user/mysql.rb
index 387cbba..3eee597 100644
--- a/lib/puppet/provider/database_user/mysql.rb
+++ b/lib/puppet/provider/database_user/mysql.rb
@@ -1,42 +1,54 @@
 Puppet::Type.type(:database_user).provide(:mysql) do
 
   desc "manage users for a mysql database."
 
   defaultfor :kernel => 'Linux'
 
   optional_commands :mysql      => 'mysql'
   optional_commands :mysqladmin => 'mysqladmin'
 
   def self.instances
-    users = mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", '-BNe' "select concat(User, '@',Host) as User from mysql.user").split("\n")
+    users = mysql([defaults_file, "mysql", '-BNe' "select concat(User, '@',Host) as User from mysql.user"].compact).split("\n")
     users.select{ |user| user =~ /.+@/ }.collect do |name|
       new(:name => name)
     end
   end
 
   def create
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "create user '%s' identified by PASSWORD '%s'" % [ @resource[:name].sub("@", "'@'"), @resource.value(:password_hash) ])
+    mysql([defaults_file, "mysql", "-e", "create user '%s' identified by PASSWORD '%s'" % [ @resource[:name].sub("@", "'@'"), @resource.value(:password_hash) ]].compact)
   end
 
   def destroy
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "drop user '%s'" % @resource.value(:name).sub("@", "'@'") )
+    mysql([defaults_file, "mysql", "-e", "drop user '%s'" % @resource.value(:name).sub("@", "'@'") ].compact)
   end
 
   def password_hash
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-NBe", "select password from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)).chomp
+    mysql([defaults_file, "mysql", "-NBe", "select password from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).chomp
   end
 
   def password_hash=(string)
-    mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-e", "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ] )
+    mysql([defaults_file, "mysql", "-e", "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ] ].compact)
   end
 
   def exists?
-    not mysql("--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "mysql", "-NBe", "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)).empty?
+    not mysql([defaults_file, "mysql", "-NBe", "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
   end
 
   def flush
     @property_hash.clear
-    mysqladmin "--defaults-file=#{Facter.value(:root_home)}/.my.cnf", "flush-privileges"
+    mysqladmin([defaults_file, "flush-privileges"].compact)
+  end
+
+  # Optional defaults file
+  def self.defaults_file
+    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
+      "--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
+    else
+      nil
+    end
+  end
+  def defaults_file
+    self.class.defaults_file
   end
 
 end