diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-14 15:15:23 +0200 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-14 15:15:23 +0200 |
commit | c9fd2749f7628969ec0a83e86add7b6b2420fd89 (patch) | |
tree | 01f3ca7f32082ec21bc9f0e3d862880a9f404065 /sql/sql_union.cc | |
parent | 2b29b55c55e63ac61fb1bf1adf19be842c9a277f (diff) | |
parent | 19f6ad06c04474abecca0cca3d6bd143fb712c45 (diff) | |
download | mariadb-git-c9fd2749f7628969ec0a83e86add7b6b2420fd89.tar.gz |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
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 d3143725878..10175bfe345 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()) |