diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-24 08:18:01 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-03-24 08:18:01 +0200 |
| commit | 4cc3fd48f6631b8428ea77040829b76f0850ac55 (patch) | |
| tree | 484747bddb387be0760dfb845effb675586dac03 /sql/sql_parse.cc | |
| parent | 7c81a515161cd952c39535546540a1d5b1314b37 (diff) | |
| download | mariadb-git-4cc3fd48f6631b8428ea77040829b76f0850ac55.tar.gz | |
MDEV-5876: MySQL bug #11766767 - "59957: VIEW USING MERGE PERMISSIONS IN MULTI-TABLE UPDATE"
Backported multi_update_check_table_access() from 5.6
The code is slightly different in MariaDB, becasue we instansiate fields in merged tables earlier.
mysql-test/mysql-test-run.pl:
Fixed comment
mysql-test/r/view_grant.result:
Merged test case from 5.6
mysql-test/t/view_grant.test:
Merged test case from 5.6
sql/sql_parse.cc:
Reset orig_want_privilege as this will be rechecked later.
If not, we will have a problem in mysql_multi_update_prepare() for the call to mysql_handle_derived()
sql/sql_update.cc:
Backport multi_update_check_table_access() from 5.6
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 830661a5b81..65a76538c73 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7685,6 +7685,7 @@ bool multi_update_precheck(THD *thd, TABLE_LIST *tables) check_grant(thd, SELECT_ACL, table, FALSE, 1, FALSE))) DBUG_RETURN(TRUE); + table->grant.orig_want_privilege= 0; table->table_in_first_from_clause= 1; } /* |