database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

reverted the fix for bug #46019 from 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2009-08-21 17:41:48 +03:00
parent a1589a1061 9a856bd483
commit d5bda7c313
5 changed files with 3 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_acl.cc
View File

@@ -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)))