diff options
| author | bell@51.0.168.192.in-addr.arpa <> | 2005-02-20 18:49:27 +0200 |
|---|---|---|
| committer | bell@51.0.168.192.in-addr.arpa <> | 2005-02-20 18:49:27 +0200 |
| commit | a11369b999e3002586697c90743ae690a5623917 (patch) | |
| tree | ef69852c850b3445152229f7707b70a1601e70c1 /sql/sql_select.cc | |
| parent | 6da6c5be0c57a2bad1aa4546ef8ea7094376cb5d (diff) | |
| parent | 2c263ff24c0daf90c2f78e8a596a0fa3e3fc4b49 (diff) | |
| download | mariadb-git-a11369b999e3002586697c90743ae690a5623917.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e8db6d5908d..992574a9ca1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7217,8 +7217,9 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top) if (conds) { conds= and_conds(conds, table->on_expr); - if (!conds->fixed) - conds->fix_fields(join->thd, 0, &conds); + /* conds is always a new item as both cond and on_expr existed */ + DBUG_ASSERT(!conds->fixed); + conds->fix_fields(join->thd, 0, &conds); } else conds= table->on_expr; @@ -11955,8 +11956,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(); |