diff options
| author | unknown <sanja@askmonty.org> | 2013-09-26 21:20:15 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-26 21:20:15 +0300 |
| commit | e5746665c9f8dcfa66a7a645f1c5517769a2fa0a (patch) | |
| tree | 56e9d83b5ef43f93d9628c25f69b81f174d48f5c /sql/item.cc | |
| parent | 828be0d9bae813d0587fbede6e02b12eebac66ca (diff) | |
| parent | 9d83468e78ba23f024ce3c11443913ad75cf1ea5 (diff) | |
| download | mariadb-git-e5746665c9f8dcfa66a7a645f1c5517769a2fa0a.tar.gz | |
merge 10.0-base -> 10.0
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 b04290f1af0..c806b1a6968 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9720,18 +9720,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 |