diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-08-21 17:41:48 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-08-21 17:41:48 +0300 |
| commit | 787a4940cabef1416dbba1942ee3a07b987e9338 (patch) | |
| tree | e6c13b235af5125765f617afc9861d0273a62159 /sql/sql_acl.cc | |
| parent | b011f1ea1c2cff73706f8b3ef8eacea2c433a9d9 (diff) | |
| parent | 8723e9d2269fec4d0a7dd4796deb53c0b2eab804 (diff) | |
| download | mariadb-git-787a4940cabef1416dbba1942ee3a07b987e9338.tar.gz | |
reverted the fix for bug #46019 from 5.1-bugteam
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index de132d169f2..ab18a2d1d04 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3905,15 +3905,11 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, continue; // ok if (!(~table->grant.privilege & want_access) || - (table->is_anonymous_derived_table() && - table->is_non_materialized_derived_table()) || table->schema_table) + table->is_anonymous_derived_table() || table->schema_table) { /* It is subquery in the FROM clause. VIEW set table->derived after - table opening, but this function is mostly called before table opening. - When it's called after table opening e.g. for nested views with - materialization we shoud check the materialized table for access as - any other table. + table opening, but this function always called before table opening. */ if (!table->referencing_view) { @@ -3926,7 +3922,6 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, } continue; } - if (!(grant_table= table_hash_search(sctx->host, sctx->ip, table->get_db_name(), sctx->priv_user, table->get_table_name(), FALSE))) |