summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorevgen@moonbone.local <>2006-11-29 15:03:53 +0300
committerevgen@moonbone.local <>2006-11-29 15:03:53 +0300
commit595d8c5bcbdde966c98475acf26653935f800bb9 (patch)
tree8a4b4dbca4f569565f89a30bab47a7700d15da81 /sql/sql_base.cc
parent1314ab222ff2ab123756081e58edce45f6bd3056 (diff)
parente851a9eaea77eb896c14b5d57a7acb6221fea2f9 (diff)
downloadmariadb-git-595d8c5bcbdde966c98475acf26653935f800bb9.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/20327-bug-5.0-opt-mysql
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7c652fdcd4f..35b36949852 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3308,6 +3308,12 @@ find_field_in_tables(THD *thd, Item_ident *item,
{
if (found == WRONG_GRANT)
return (Field*) 0;
+
+ /*
+ Only views fields should be marked as dependent, not an underlying
+ fields.
+ */
+ if (!table_ref->belong_to_view)
{
SELECT_LEX *current_sel= thd->lex->current_select;
SELECT_LEX *last_select= table_ref->select_lex;