diff options
| author | unknown <sanja@askmonty.org> | 2013-09-25 21:07:06 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-25 21:07:06 +0300 |
| commit | 9d83468e78ba23f024ce3c11443913ad75cf1ea5 (patch) | |
| tree | 0cef7fa6a3fd2e47fe22d105b2b8bbfe1b5a03e0 /sql/item.cc | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| parent | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (diff) | |
| download | mariadb-git-9d83468e78ba23f024ce3c11443913ad75cf1ea5.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/item.cc b/sql/item.cc index 1caa924f753..fa4c4eb99b0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9641,18 +9641,10 @@ table_map Item_ref::used_tables() const } -void Item_ref::update_used_tables() +void Item_ref::update_used_tables() { if (!get_depended_from()) (*ref)->update_used_tables(); - maybe_null|= (*ref)->maybe_null; -} - -void Item_direct_view_ref::update_used_tables() -{ - Item_ref::update_used_tables(); - if (view->table && view->table->maybe_null) - maybe_null= TRUE; } table_map Item_direct_view_ref::used_tables() const |