diff options
| author | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
| commit | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (patch) | |
| tree | c313ec7d9f9db0c90649df5297e2d39230986291 /sql/item.cc | |
| parent | 72dffd878e47e4fcfd224cadfea06caed0ac956b (diff) | |
| parent | ec7da1561e028aac40dee69433113978c982ce84 (diff) | |
| download | mariadb-git-64d6d8334fa63a0faa6d91ded21eca8e3871c7ec.tar.gz | |
merge 5.3 -> 5.5
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 a4b880d05c1..88e654d07b5 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9629,18 +9629,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 |