← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merge from Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
7316
7316
{
7317
7317
  Item *pos;
7318
7318
  List_iterator_fast<Item> li(all_fields);
7319
 
  Copy_field *copy= NULL;
 
7319
  CopyField *copy= NULL;
7320
7320
  res_selected_fields.empty();
7321
7321
  res_all_fields.empty();
7322
7322
  List_iterator_fast<Item> itr(res_all_fields);
7324
7324
  uint32_t i, border= all_fields.elements - elements;
7325
7325
 
7326
7326
  if (param->field_count &&
7327
 
      !(copy=param->copy_field= new Copy_field[param->field_count]))
 
7327
      !(copy=param->copy_field= new CopyField[param->field_count]))
7328
7328
    goto err2;
7329
7329
 
7330
7330
  param->copy_funcs.empty();
7445
7445
*/
7446
7446
void copy_fields(Tmp_Table_Param *param)
7447
7447
{
7448
 
  Copy_field *ptr=param->copy_field;
7449
 
  Copy_field *end=param->copy_field_end;
 
7448
  CopyField *ptr= param->copy_field;
 
7449
  CopyField *end= param->copy_field_end;
7450
7450
 
7451
7451
  for (; ptr != end; ptr++)
7452
7452
    (*ptr->do_copy)(ptr);