~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Nathan Williams
  • Date: 2009-06-05 22:22:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1063.
  • Revision ID: nathanlws@gmail.com-20090605222221-usmgpjhggrwjgz9w
No actual code changes. Changed Copy_field to CopyField, to reflect the coding standards.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4291
4291
                         bool error_if_not_empty)
4292
4292
{
4293
4293
  int error;
4294
 
  Copy_field *copy,*copy_end;
 
4294
  CopyField *copy,*copy_end;
4295
4295
  ulong found_count,delete_count;
4296
4296
  Session *session= current_session;
4297
4297
  uint32_t length= 0;
4315
4315
  if (error)
4316
4316
    return -1;
4317
4317
 
4318
 
  if (!(copy= new Copy_field[to->s->fields]))
 
4318
  if (!(copy= new CopyField[to->s->fields]))
4319
4319
    return -1;                          /* purecov: inspected */
4320
4320
 
4321
4321
  if (to->file->ha_external_lock(session, F_WRLCK))
4415
4415
        to->next_number_field->reset();
4416
4416
    }
4417
4417
 
4418
 
    for (Copy_field *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++)
 
4418
    for (CopyField *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++)
4419
4419
    {
4420
4420
      copy_ptr->do_copy(copy_ptr);
4421
4421
    }