diff options
author | unknown <sergefp@mysql.com> | 2005-02-14 23:49:01 +0300 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-02-14 23:49:01 +0300 |
commit | 92f55e98dd25ef7eaef40b026fba169dbf0a28dd (patch) | |
tree | f59f081a6ecc00ab3061062346452a81619cfa08 /sql/sql_select.cc | |
parent | 3ca0e28ccc37e7a49bbda5de892725c0d8d36683 (diff) | |
parent | 4173610bd23f07545843e0671f402cfcb6eadc32 (diff) | |
download | mariadb-git-92f55e98dd25ef7eaef40b026fba169dbf0a28dd.tar.gz |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8218
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a4dea2ba5f4..05314097ca3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8614,8 +8614,7 @@ copy_fields(TMP_TABLE_PARAM *param) for (; ptr != end; ptr++) (*ptr->do_copy)(ptr); - List_iterator_fast<Item> &it=param->copy_funcs_it; - it.rewind(); + List_iterator_fast<Item> it(param->copy_funcs); Item_copy_string *item; while ((item = (Item_copy_string*) it++)) item->copy(); |