← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 16:15:33 UTC
  • mfrom: (2179.2.1 list-clear)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: brian@tangent.org-20110218161533-mkgbhtbpfj8mb12x
Merge in clear() by Olaf

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2770
2770
    {                                           
2771
2771
      /* Argument list contains only one element, so reduce it so a single item, then remove list */
2772
2772
      item= ((Item_cond*) cond)->argument_list()->head();
2773
 
      ((Item_cond*) cond)->argument_list()->empty();
 
2773
      ((Item_cond*) cond)->argument_list()->clear();
2774
2774
      return item;
2775
2775
    }
2776
2776
  }
5800
5800
  Item *pos;
5801
5801
  List_iterator_fast<Item> li(all_fields);
5802
5802
  CopyField *copy= NULL;
5803
 
  res_selected_fields.empty();
5804
 
  res_all_fields.empty();
 
5803
  res_selected_fields.clear();
 
5804
  res_all_fields.clear();
5805
5805
  List_iterator_fast<Item> itr(res_all_fields);
5806
5806
  List<Item> extra_funcs;
5807
5807
  uint32_t i, border= all_fields.elements - elements;
5810
5810
      !(copy=param->copy_field= new CopyField[param->field_count]))
5811
5811
    goto err2;
5812
5812
 
5813
 
  param->copy_funcs.empty();
 
5813
  param->copy_funcs.clear();
5814
5814
  for (i= 0; (pos= li++); i++)
5815
5815
  {
5816
5816
    Field *field;
5966
5966
  List_iterator_fast<Item> it(all_fields);
5967
5967
  Item *item_field,*item;
5968
5968
 
5969
 
  res_selected_fields.empty();
5970
 
  res_all_fields.empty();
 
5969
  res_selected_fields.clear();
 
5970
  res_all_fields.clear();
5971
5971
 
5972
5972
  uint32_t i, border= all_fields.elements - elements;
5973
5973
  for (i= 0; (item= it++); i++)
6044
6044
{
6045
6045
  List_iterator_fast<Item> it(all_fields);
6046
6046
  Item *item, *new_item;
6047
 
  res_selected_fields.empty();
6048
 
  res_all_fields.empty();
 
6047
  res_selected_fields.clear();
 
6048
  res_all_fields.clear();
6049
6049
 
6050
6050
  uint32_t i, border= all_fields.elements - elements;
6051
6051
  for (i= 0; (item= it++); i++)