diff options
author | unknown <bell@sanja.is.com.ua> | 2002-12-10 11:45:40 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-12-10 11:45:40 +0200 |
commit | 6f88718fc9cffbb4cdff768de100691a70067272 (patch) | |
tree | f6ca7aa660a25caf3c2288ff373f1cb799f4e33b /sql/item_row.h | |
parent | cd292d1f0375f8069fd230da38dcc1f6826674a3 (diff) | |
parent | 3b24e7c0657377283356d934f4da11e3b940f80b (diff) | |
download | mariadb-git-6f88718fc9cffbb4cdff768de100691a70067272.tar.gz |
merging
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_row.h')
-rw-r--r-- | sql/item_row.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 5580250b4fb..d097fca8f1d 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -17,13 +17,17 @@ class Item_row: public Item { bool array_holder; - table_map tables; + table_map used_tables_cache; + bool const_item_cache; uint arg_count; Item **items; public: Item_row(List<Item> &); Item_row(Item_row *item): - Item(), array_holder(0), tables(item->tables), arg_count(item->arg_count), + Item(), array_holder(0), + used_tables_cache(item->used_tables_cache), + const_item_cache(item->const_item_cache), + arg_count(item->arg_count), items(item->items) {} @@ -56,8 +60,10 @@ public: return 0; }; bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref); - table_map used_tables() const { return tables; }; + table_map used_tables() const { return used_tables_cache; }; + bool const_item() const { return const_item_cache; }; enum Item_result result_type() const { return ROW_RESULT; } + void update_used_tables(); virtual uint cols() { return arg_count; } virtual Item* el(uint i) { return items[i]; } |