database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

Browse Source 
into  andrepl.(none):/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2007-03-24 14:14:46 +02:00
parent 119087fbd0 d9a56f9129
commit 7b41fd46d4
8 changed files with 182 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@ -5164,7 +5164,10 @@ bool check_single_table_access(THD *thd, ulong privilege,
goto deny;
/* Show only 1 table for check_grant */
if (grant_option && check_grant(thd, privilege, all_tables, 0, 1, 0))
if (grant_option &&
!(all_tables->belong_to_view &&
(thd->lex->sql_command == SQLCOM_SHOW_FIELDS)) &&
check_grant(thd, privilege, all_tables, 0, 1, 0))
goto deny;
thd->security_ctx= backup_ctx;