diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-06 22:42:07 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-06 22:42:07 -0700 |
| commit | 3d915225611a921fad03934e58bf281b48fc15b0 (patch) | |
| tree | ea8cbc9d70015a17aad75df30e7d223476eaa4da /sql/sql_update.cc | |
| parent | 4b559b912f5a3aa02a226fdacddaa3b80a8ade42 (diff) | |
| download | mariadb-git-3d915225611a921fad03934e58bf281b48fc15b0.tar.gz | |
WL#2360 Performance schema
Part IV: sql instrumentation
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b197434d798..dec83f199ab 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1,4 +1,4 @@ -/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1074,9 +1074,10 @@ reopen_tables: if (!tl->derived) { uint want_privilege= tl->updating ? UPDATE_ACL : SELECT_ACL; - if (check_access(thd, want_privilege, - tl->db, &tl->grant.privilege, 0, 0, - test(tl->schema_table)) || + if (check_access(thd, want_privilege, tl->db, + &tl->grant.privilege, + &tl->grant.m_internal, + 0, 0) || check_grant(thd, want_privilege, tl, FALSE, 1, FALSE)) DBUG_RETURN(TRUE); } |