(MODULES-1330) Change order of revokation

xbezdick · Sep 16, 2014 · bbbc6cd · bbbc6cd
1 parent fbef97d
commit bbbc6cd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/puppet/provider/mysql_grant/mysql.rb b/lib/puppet/provider/mysql_grant/mysql.rb
@@ -89,13 +89,15 @@ def revoke(user, table)
     user_string = self.class.cmd_user(user)
     table_string = self.class.cmd_table(table)
 
-    query = "REVOKE ALL ON #{table_string} FROM #{user_string}"
-    mysql([defaults_file, '-e', query].compact)
     # revoke grant option needs to be a extra query, because
     # "REVOKE ALL PRIVILEGES, GRANT OPTION [..]" is only valid mysql syntax
     # if no ON clause is used.
+    # It hast to be executed before "REVOKE ALL [..]" since a GRANT has to
+    # exist to be executed successfully
     query = "REVOKE GRANT OPTION ON #{table_string} FROM #{user_string}"
     mysql([defaults_file, '-e', query].compact)
+    query = "REVOKE ALL ON #{table_string} FROM #{user_string}"
+    mysql([defaults_file, '-e', query].compact)
   end
 
   def destroy