diff options
author | unknown <bell@sanja.is.com.ua> | 2002-12-10 11:41:47 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-12-10 11:41:47 +0200 |
commit | cd292d1f0375f8069fd230da38dcc1f6826674a3 (patch) | |
tree | c1c513407c3e410751e0ed34e9a4f5178ba1490e /sql/sql_union.cc | |
parent | 3a25ef21911d37253142c0f09adc2e5168194b70 (diff) | |
parent | 59b3711986a8b016628d5d87289e9b66b1758787 (diff) | |
download | mariadb-git-cd292d1f0375f8069fd230da38dcc1f6826674a3.tar.gz |
merging
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 6e8c2ebdb5c..1bad04c3d67 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -216,7 +216,7 @@ int st_select_lex_unit::exec() if (optimized && item && item->assigned()) { item->assigned(0); // We will reinit & rexecute unit - item->assign_null(); + item->reset(); table->file->delete_all_rows(); } for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select()) |