diff options
| author | monty@hundin.mysql.fi <> | 2002-10-02 13:56:17 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-10-02 13:56:17 +0300 |
| commit | 7377f546316b13c2563fede4c3ed2506d29a93ac (patch) | |
| tree | db82378be1bc2cf5484e34071c056809f00da2d0 /sql | |
| parent | bf5b57ad2b6ccb016b1d2d5d360262755b511598 (diff) | |
| parent | bef1d7d32e62f99390f8472b836dceffc5ddecad (diff) | |
| download | mariadb-git-7377f546316b13c2563fede4c3ed2506d29a93ac.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9e834e3cab9..d6e40889eed 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1878,10 +1878,10 @@ mysql_execute_command(void) lex->lock_option); break; case SQLCOM_REPLACE: - if (check_access(thd,INSERT_ACL | UPDATE_ACL | DELETE_ACL, + if (check_access(thd,INSERT_ACL | DELETE_ACL, tables->db,&tables->grant.privilege)) goto error; /* purecov: inspected */ - if (grant_option && check_grant(thd,INSERT_ACL | UPDATE_ACL | DELETE_ACL, + if (grant_option && check_grant(thd,INSERT_ACL | DELETE_ACL, tables)) goto error; @@ -1899,7 +1899,7 @@ mysql_execute_command(void) */ { ulong privilege= (lex->sql_command == SQLCOM_INSERT_SELECT ? - INSERT_ACL : INSERT_ACL | UPDATE_ACL | DELETE_ACL); + INSERT_ACL : INSERT_ACL | DELETE_ACL); TABLE_LIST *save_next=tables->next; tables->next=0; if (check_access(thd, privilege, |