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.h | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| parent | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (diff) | |
| download | mariadb-git-9d83468e78ba23f024ce3c11443913ad75cf1ea5.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index 9b38f4b8bec..67e2b1dd48c 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2102,8 +2102,6 @@ public: void update_used_tables() { update_table_bitmaps(); - if (field && field->table) - maybe_null|= field->maybe_null(); } Item *get_tmp_table_item(THD *thd); bool collect_item_field_processor(uchar * arg); @@ -3249,7 +3247,6 @@ public: void update_used_tables() { orig_item->update_used_tables(); - maybe_null|= orig_item->maybe_null; } bool const_item() const { return orig_item->const_item(); } table_map not_null_tables() const { return orig_item->not_null_tables(); } @@ -3342,7 +3339,6 @@ public: Item *replace_equal_field(uchar *arg); table_map used_tables() const; table_map not_null_tables() const; - void update_used_tables(); bool walk(Item_processor processor, bool walk_subquery, uchar *arg) { return (*ref)->walk(processor, walk_subquery, arg) || |