summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-05 11:48:06 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-05 11:48:06 +0300
commit09ff80f2a076b1ba6db95484a23b402f7559962b (patch)
tree1c02b7898264deb2b3603f162e4655ff2dd83bd6 /sql/sql_parse.cc
parent85f3e8ce24e46516af540e08dfd51235a386fadf (diff)
parent0e11bad589849ef5422dd5c4aca593ba01886dd8 (diff)
downloadmariadb-git-09ff80f2a076b1ba6db95484a23b402f7559962b.tar.gz
Manual merge from mysql-5.1.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
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;