database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Porting back security fix from 4.0.

Browse Source 
All tests plus grant.pl test passed.
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-04-29 18:24:33 +03:00
parent 7a01adf55a
commit 0ed1cbbd48
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_base.cc
View File

@@ -1878,8 +1878,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
for (; tables ; tables=tables->next) for (; tables ; tables=tables->next)
{ {
TABLE *table=tables->table; TABLE *table=tables->table;
if (grant_option && !thd->master_access && if (grant_option && !(table->grant.privilege &
check_grant_all_columns(thd,SELECT_ACL,table) ) table->grant.want_privilege) &&
check_grant_all_columns(thd,SELECT_ACL,table))
DBUG_RETURN(-1); DBUG_RETURN(-1);
if (!table_name || (!strcmp(table_name,tables->alias) && if (!table_name || (!strcmp(table_name,tables->alias) &&
(!db_name || !tables->db || (!db_name || !tables->db ||