diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
| commit | 469d7c12b804c0e29de14356b75066c58b005c76 (patch) | |
| tree | 07c0b532d9d3d9f16c7b279334a18dad3b2e7292 /sql/sql_update.cc | |
| parent | 59e6d10603ee77b053171832a9146010884b921d (diff) | |
| parent | 258c9e9dc7d7aa35a4f56d182761fb356946e5d0 (diff) | |
| download | mariadb-git-469d7c12b804c0e29de14356b75066c58b005c76.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 61185c5d710..8c71f395187 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -825,7 +825,8 @@ bool mysql_multi_update_prepare(THD *thd) { uint want_privilege= tl->updating ? UPDATE_ACL : SELECT_ACL; if (check_access(thd, want_privilege, - tl->db, &tl->grant.privilege, 0, 0) || + tl->db, &tl->grant.privilege, 0, 0, + test(tl->schema_table)) || (grant_option && check_grant(thd, want_privilege, tl, 0, 1, 0))) DBUG_RETURN(TRUE); } |