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.h | |
| parent | 828be0d9bae813d0587fbede6e02b12eebac66ca (diff) | |
| parent | 9d83468e78ba23f024ce3c11443913ad75cf1ea5 (diff) | |
| download | mariadb-git-e5746665c9f8dcfa66a7a645f1c5517769a2fa0a.tar.gz | |
merge 10.0-base -> 10.0
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 fc8cb58df7a..e03012d9403 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2105,8 +2105,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); @@ -3354,7 +3352,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(); } @@ -3447,7 +3444,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) || |