mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 14:15:33 +02:00
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
This commit is contained in:
commit
44289ba658
27 changed files with 160 additions and 149 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue