diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
| commit | 68baf07dcd985376fae9d24c12ee0ff560b61e8f (patch) | |
| tree | 175f775e9847a50e7b51162573ae24f276abea96 /sql/item.cc | |
| parent | cbaf6e6b61241db6e97648c73dbeb0a15614a7aa (diff) | |
| parent | 362c2bca3e170031d33622f27d978c9570d0a9f5 (diff) | |
| download | mariadb-git-68baf07dcd985376fae9d24c12ee0ff560b61e8f.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index e0e7a4288da..bc98a9a3184 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9609,7 +9609,7 @@ table_map Item_direct_view_ref::used_tables() const { return get_depended_from() ? OUTER_REF_TABLE_BIT : - ((view->merged || !view->table) ? + ((view->is_merged_derived() || view->merged || !view->table) ? (*ref)->used_tables() : view->table->map); } @@ -9618,7 +9618,7 @@ table_map Item_direct_view_ref::not_null_tables() const { return get_depended_from() ? 0 : - ((view->merged || !view->table) ? + ((view->is_merged_derived() || view->merged || !view->table) ? (*ref)->not_null_tables() : view->table->map); } |