diff options
| author | unknown <evgen@moonbone.local> | 2007-05-11 23:22:13 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-05-11 23:22:13 +0400 |
| commit | 86dccd92897fe123077f27f8a1bb6c8aa55cee6c (patch) | |
| tree | 06fd683ae3b24d005e2984ca6ccee3ea2a139a60 /sql | |
| parent | 361905687e473a71083c5d3c69f3b939943cce7c (diff) | |
| parent | 04efdb1526fbe97ffe003a83da81a550dd234991 (diff) | |
| download | mariadb-git-86dccd92897fe123077f27f8a1bb6c8aa55cee6c.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/27878-bug-5.0-opt-mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_prepare.cc | 5 | ||||
| -rw-r--r-- | sql/sql_update.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 1ec65743b0f..90361f8ff0d 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, diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e17c71ae541..222e33345cc 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -173,8 +173,9 @@ int mysql_update(THD *thd, table->quick_keys.clear_all(); #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, &conds, order_num, order)) DBUG_RETURN(1); |