diff options
| author | unknown <ingo@mysql.com> | 2006-04-11 15:18:16 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-04-11 15:18:16 +0200 |
| commit | d8a46094be7e972361bb81ff9902ffd081f69560 (patch) | |
| tree | 50524d9f5eb4f0f856c33a731da801d72b21ad03 /sql/item_row.h | |
| parent | 8c9ac3ecb42366c59321dc94c41331bcce122f58 (diff) | |
| parent | d7caa2a02aedec5a294bbb0c64aed048f23dc6be (diff) | |
| download | mariadb-git-d8a46094be7e972361bb81ff9902ffd081f69560.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5390
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 39bc4513e1e..28cb47b6815 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -19,7 +19,6 @@ class Item_row: public Item Item **items; table_map used_tables_cache; uint arg_count; - bool array_holder; bool const_item_cache; bool with_null; public: @@ -29,7 +28,6 @@ public: items(item->items), used_tables_cache(item->used_tables_cache), arg_count(item->arg_count), - array_holder(0), const_item_cache(item->const_item_cache), with_null(0) {} @@ -57,6 +55,7 @@ public: return 0; }; bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref); + void cleanup(); void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields); table_map used_tables() const { return used_tables_cache; }; bool const_item() const { return const_item_cache; }; |