diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 11:48:06 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 11:48:06 +0300 |
| commit | a35e013144da7cd3f2b095f11ec91fffd58e2b3a (patch) | |
| tree | 1c02b7898264deb2b3603f162e4655ff2dd83bd6 /sql/sql_parse.cc | |
| parent | b30c1886dc52153009c2ea67878a9763448f461e (diff) | |
| parent | e066294824b2319ca1c27ea2cc38ad2e8d1b8b3e (diff) | |
| download | mariadb-git-a35e013144da7cd3f2b095f11ec91fffd58e2b3a.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 6b4dd82e98a..21c2dd072a2 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5153,8 +5153,6 @@ bool check_single_table_access(THD *thd, ulong privilege, /* Show only 1 table for check_grant */ if (!(all_tables->belong_to_view && (thd->lex->sql_command == SQLCOM_SHOW_FIELDS)) && - !(all_tables->view && - all_tables->effective_algorithm == VIEW_ALGORITHM_TMPTABLE) && check_grant(thd, privilege, all_tables, 0, 1, no_errors)) goto deny; |