diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-12 00:22:15 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-12 00:22:15 +0500 |
| commit | 2e3baa6844425290c56ea2cb1ac32d4171792377 (patch) | |
| tree | 355abea4a480af1654e33a48c828b9517ae544ae /sql/sql_prepare.cc | |
| parent | ee7677d125ac91429bab45d2943f531400adc4d1 (diff) | |
| parent | bd311c0c44ee3c5271665a08f0825e9da8c92913 (diff) | |
| download | mariadb-git-2e3baa6844425290c56ea2cb1ac32d4171792377.tar.gz | |
Merge mysql.com:/home/hf/work/27957/my50-27957
into mysql.com:/home/hf/work/27957/my51-27957
mysql-test/t/grant.test:
Auto merged
mysql-test/r/grant.result:
merging
sql/sql_update.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 31a6c7af04a..11bf367c254 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1164,8 +1164,9 @@ static int mysql_test_update(Prepared_statement *stmt, goto error; #ifndef NO_EMBEDDED_ACCESS_CHECKS - /* TABLE_LIST contain right privilages request */ - want_privilege= table_list->grant.want_privilege; + /* Force privilege re-checking for views after they have been opened. */ + want_privilege= (table_list->view ? UPDATE_ACL : + table_list->grant.want_privilege); #endif if (mysql_prepare_update(thd, table_list, &select->where, |