← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-18 10:22:24 UTC
  • mto: (2180.1.3 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: olafvdspek@gmail.com-20110218102224-bjqbn4734ylsol0u
Rename List::empty to clear (std::list uses clear)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2112
2112
      We can't call delete_elements() on copy_funcs as this will cause
2113
2113
      problems in free_elements() as some of the elements are then deleted.
2114
2114
    */
2115
 
    tmp_table_param.copy_funcs.empty();
 
2115
    tmp_table_param.copy_funcs.clear();
2116
2116
    /*
2117
2117
      If we have tmp_join and 'this' Join is not tmp_join and
2118
2118
      tmp_table_param.copy_field's  of them are equal then we have to remove
2281
2281
  {
2282
2282
    rollup.getNullItems()[i]= new (session->mem_root) Item_null_result();
2283
2283
    List<Item> *rollup_fields= &rollup.getFields()[i];
2284
 
    rollup_fields->empty();
 
2284
    rollup_fields->clear();
2285
2285
    rollup.getRefPointerArrays()[i]= ref_array;
2286
2286
    ref_array+= all_fields.elements;
2287
2287
  }