← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/field.cc

  • Committer: Mark Atwood
  • Date: 2011-06-16 15:05:43 UTC
  • mfrom: (2318.4.15 refactor10)
  • Revision ID: me@mark.atwood.name-20110616150543-ydrgmzb685nzcjr9
merge lp:~olafvdspek/drizzle/refactor10

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/field.cc
94
94
  if (result->field_buffer == NULL)
95
95
  {
96
96
    result->field_buffer= new drizzle_field_t_type[(*total) + 1];
97
 
    if (result->field_buffer == NULL)
98
 
    {
99
 
      drizzle_set_error(result->con->drizzle, "drizzle_field_buffer", "malloc");
100
 
      *ret_ptr= DRIZZLE_RETURN_MEMORY;
101
 
      return NULL;
102
 
    }
103
97
  }
104
98
 
105
99
  memcpy(result->field_buffer + offset, field, size);