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 | e46a193be82ba9956ac2db8e015fb528c84842da (patch) | |
| tree | 96d659fbe401a4fa1269027a7637692d3bfc1258 /sql/item_row.cc | |
| parent | 10633fd8397f8450b5076bb98f336f6d20967b5d (diff) | |
| parent | f37d610147cbd51bde10aceac4d18e2f1c415e68 (diff) | |
| download | mariadb-git-e46a193be82ba9956ac2db8e015fb528c84842da.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.cc')
| -rw-r--r-- | sql/item_row.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index 75c3f8a2922..f5c8d511025 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -26,7 +26,7 @@ */ Item_row::Item_row(List<Item> &arg): - Item(), used_tables_cache(0), array_holder(1), const_item_cache(1), with_null(0) + Item(), used_tables_cache(0), const_item_cache(1), with_null(0) { //TODO: think placing 2-3 component items in item (as it done for function) @@ -85,6 +85,20 @@ bool Item_row::fix_fields(THD *thd, Item **ref) } +void Item_row::cleanup() +{ + DBUG_ENTER("Item_row::cleanup"); + + Item::cleanup(); + /* Reset to the original values */ + used_tables_cache= 0; + const_item_cache= 1; + with_null= 0; + + DBUG_VOID_RETURN; +} + + void Item_row::split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields) { |