diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-06-26 14:05:41 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-06-26 14:05:41 +0400 |
| commit | 27f9fc063c54ad8c9c0e35e78bbbb14a3e2419af (patch) | |
| tree | af692374b15c7e8186406a1009e678cfedc3e78b /sql/item_row.h | |
| parent | 7754be7f4c19d442564d8fef6853e711aa0e3cec (diff) | |
| parent | 50cc6c9d8a7d68ace0802702f3bc10cb2afb3730 (diff) | |
| download | mariadb-git-27f9fc063c54ad8c9c0e35e78bbbb14a3e2419af.tar.gz | |
MariaDB 5.2 -> MariaDB 5.3 merge
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 481454e5433..c7fb8d59220 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -16,7 +16,7 @@ class Item_row: public Item { Item **items; - table_map used_tables_cache; + table_map used_tables_cache, not_null_tables_cache; uint arg_count; bool const_item_cache; bool with_null; @@ -26,6 +26,7 @@ public: Item(), items(item->items), used_tables_cache(item->used_tables_cache), + not_null_tables_cache(0), arg_count(item->arg_count), const_item_cache(item->const_item_cache), with_null(0) @@ -66,6 +67,7 @@ public: bool const_item() const { return const_item_cache; }; enum Item_result result_type() const { return ROW_RESULT; } void update_used_tables(); + table_map not_null_tables() const { return not_null_tables_cache; } virtual void print(String *str, enum_query_type query_type); bool walk(Item_processor processor, bool walk_subquery, uchar *arg); |