diff options
| author | unknown <konstantin@mysql.com> | 2006-04-12 18:30:54 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-12 18:30:54 +0400 |
| commit | f65489f8132e421252846857cbb55043de4632fd (patch) | |
| tree | 96d659fbe401a4fa1269027a7637692d3bfc1258 /sql/item_row.h | |
| parent | f4e5a77d50e921b9d90a2ea9cfc24445bc4deb93 (diff) | |
| parent | de895a442f9fc9a4f9cc3ad965918473724f0548 (diff) | |
| download | mariadb-git-f65489f8132e421252846857cbb55043de4632fd.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-16365
into mysql.com:/opt/local/work/mysql-5.0-merge
sql/set_var.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/item_row.cc:
Manual merge.
sql/item_row.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/set_var.h:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
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 6fbe7436b72..d6dd4371372 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) {} @@ -62,6 +60,7 @@ public: return 0; }; bool fix_fields(THD *thd, 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; }; |