diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
| commit | acc2b9e3662cd868f5108b1b4ee7257d95582f02 (patch) | |
| tree | 772f4ae43ad7ce905f024b77bebdd1897d813391 /sql/item_row.h | |
| parent | 41f23283e54d311155959faf58ae7edf81803ca3 (diff) | |
| parent | 84917914e01415cbbc2a128cabc344c127e76db1 (diff) | |
| download | mariadb-git-acc2b9e3662cd868f5108b1b4ee7257d95582f02.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy
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 7c08c5888e0..87988e718ca 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -19,7 +19,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; @@ -29,6 +29,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) @@ -68,6 +69,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); |