diff options
| author | tnurnberg@sin.intern.azundris.com <> | 2007-03-23 20:40:35 +0100 |
|---|---|---|
| committer | tnurnberg@sin.intern.azundris.com <> | 2007-03-23 20:40:35 +0100 |
| commit | 93db05429f879098d48c5cc1c9e97940ee921e3d (patch) | |
| tree | 600319f331d90884fcd8205fc6d7afcedaf1f080 /sql/sql_parse.cc | |
| parent | 364139c58b7ae89d72a997984136adf0a0da50d3 (diff) | |
| parent | 7c638268948dae63be1a9eb3aa83da040e028aba (diff) | |
| download | mariadb-git-93db05429f879098d48c5cc1c9e97940ee921e3d.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1b8bfd38fc4..40914339cf1 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5159,7 +5159,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; |