diff options
| author | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
| commit | 639899d67fc4d3e733e5e14ac6845be528d050b8 (patch) | |
| tree | dbb4c85840636d99a9d0ab51a698645946f49c1e /sql/item_cmpfunc.cc | |
| parent | 1c212067b2016ed0bab8e362be2acb042ce03659 (diff) | |
| parent | 28cb7814e92ac8339f4f2f34f8212b9683b101c7 (diff) | |
| download | mariadb-git-639899d67fc4d3e733e5e14ac6845be528d050b8.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 55d511bb39d..4046a4d6414 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1657,26 +1657,19 @@ Item_cond::Item_cond(THD *thd, Item_cond *item) and_tables_cache(item->and_tables_cache) { /* - here should be following text: - - List_iterator_fast<Item*> li(item.list); - while(Item *it= li++) - list.push_back(it); - - but it do not need, - because this constructor used only for AND/OR and - argument list will be copied by copy_andor_arguments call + item->list will be copied by copy_andor_arguments() call */ - } + void Item_cond::copy_andor_arguments(THD *thd, Item_cond *item) { List_iterator_fast<Item> li(item->list); - while(Item *it= li++) + while (Item *it= li++) list.push_back(it->copy_andor_structure(thd)); } + bool Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { |