Merge pull request #3177 from stintel/mysql56-compat
Fix MySQL 5.6 compatibility
This commit is contained in:
commit
653d78c23d
1 changed files with 3 additions and 2 deletions
|
@ -157,8 +157,9 @@ def user_mod(cursor, user, host, password, new_priv):
|
||||||
# the new specification, then revoke all privileges on it.
|
# the new specification, then revoke all privileges on it.
|
||||||
for db_table, priv in curr_priv.iteritems():
|
for db_table, priv in curr_priv.iteritems():
|
||||||
if db_table not in new_priv:
|
if db_table not in new_priv:
|
||||||
privileges_revoke(cursor, user,host,db_table)
|
if user != "root" and "PROXY" not in priv:
|
||||||
changed = True
|
privileges_revoke(cursor, user,host,db_table)
|
||||||
|
changed = True
|
||||||
|
|
||||||
# If the user doesn't currently have any privileges on a db.table, then
|
# If the user doesn't currently have any privileges on a db.table, then
|
||||||
# we can perform a straight grant operation.
|
# we can perform a straight grant operation.
|
||||||
|
|
Loading…
Reference in a new issue