← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/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:
drizzled/table.cc
2748
2748
  unsigned char *null_flags;
2749
2749
  Field **reg_field, **from_field, **default_field;
2750
2750
  uint32_t *blob_field;
2751
 
  Copy_field *copy= 0;
 
2751
  CopyField *copy= 0;
2752
2752
  KEY *keyinfo;
2753
2753
  KEY_PART_INFO *key_part_info;
2754
2754
  Item **copy_func;
2827
2827
  {
2828
2828
    return NULL;                                /* purecov: inspected */
2829
2829
  }
2830
 
  /* Copy_field belongs to Tmp_Table_Param, allocate it in Session mem_root */
2831
 
  if (!(param->copy_field= copy= new (session->mem_root) Copy_field[field_count]))
 
2830
  /* CopyField belongs to Tmp_Table_Param, allocate it in Session mem_root */
 
2831
  if (!(param->copy_field= copy= new (session->mem_root) CopyField[field_count]))
2832
2832
  {
2833
2833
    free_root(&own_root, MYF(0));               /* purecov: inspected */
2834
2834
    return NULL;                                /* purecov: inspected */