Merge pull request #3177 from stintel/mysql56-compat

Fix MySQL 5.6 compatibility
2013-06-16 19:27:17 -07:00 · 2013-06-16 19:27:17 -07:00 · 653d78c23d
commit 653d78c23d
parent ae223ae10f 66ffef5967
1 changed files with 3 additions and 2 deletions
--- a/database/mysql_user
+++ b/database/mysql_user
@ -157,6 +157,7 @@ def user_mod(cursor, user, host, password, new_priv):
        # the new specification, then revoke all privileges on it.
        for db_table, priv in curr_priv.iteritems():
            if db_table not in new_priv:
+                if user != "root" and "PROXY" not in priv:
                    privileges_revoke(cursor, user,host,db_table)
                    changed = True