diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:24:51 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:24:51 +0100 |
| commit | 56219e755e47dd81e4d75200b312725745c0866e (patch) | |
| tree | 08d8ff637f1797cf18d33512f3298e4827c4f019 /sql/sql_base.cc | |
| parent | 5cad510490ee56630f667af6091702116086332a (diff) | |
| parent | 5e4dc47a62c7e3c810cfd7f19f6b756f65a112bc (diff) | |
| download | mariadb-git-56219e755e47dd81e4d75200b312725745c0866e.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 75becc31bc1..afd287630ad 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4225,6 +4225,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; |