diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
| commit | b92ab41c5c380448422bd776c73fddfd5c7507f6 (patch) | |
| tree | 3b69ab5126c40ef71ad69a5bb469de82c4be90a0 /sql/sql_update.cc | |
| parent | dfc15e2acc9312c3357b6149feb771c724ba8252 (diff) | |
| parent | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (diff) | |
| download | mariadb-git-b92ab41c5c380448422bd776c73fddfd5c7507f6.tar.gz | |
Merge next-mr -> next-4284
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 389c4da3e4d..600c4a2f2dc 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 @@ -1076,9 +1076,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); } |