diff options
| author | unknown <sanja@montyprogram.com> | 2012-10-05 12:26:55 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-10-05 12:26:55 +0300 |
| commit | b0d11675fb46f5db458896a9a17f03bd53d98e88 (patch) | |
| tree | 99ed64fa06871de511f40cd456a20960ef2b54a4 /sql/item.cc | |
| parent | c56fd181bff92dd377b4664583d4fe04ead16ac7 (diff) | |
| download | mariadb-git-b0d11675fb46f5db458896a9a17f03bd53d98e88.tar.gz | |
Fix of MDEV-589.
The problem was in incorrect detection of merged views in tem_direct_view_ref::used_tables() .
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 18a86aa2d1a..98c27266415 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9175,7 +9175,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); } @@ -9184,7 +9184,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); } |