← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
170
170
    if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
171
171
    {
172
172
      Field_blob::store_length(length);
173
 
      memcpy(ptr+packlength, (char*) &from, sizeof(char*));
 
173
      memcpy(ptr+packlength, &from, sizeof(char*));
174
174
      return 0;
175
175
    }
176
176
    if (tmpstr.copy(from, length, cs))
190
190
                                            from, length);
191
191
    Field_blob::store_length(copy_length);
192
192
    tmp= value.ptr();
193
 
    memcpy(ptr + packlength, (uchar*) &tmp, sizeof(char*));
 
193
    memcpy(ptr + packlength, &tmp, sizeof(char*));
194
194
    return 0;
195
195
  }
196
196
  /*
208
208
 
209
209
  Field_blob::store_length(copy_length);
210
210
  tmp= value.ptr();
211
 
  memcpy(ptr+packlength, (uchar*) &tmp, sizeof(char*));
 
211
  memcpy(ptr+packlength, &tmp, sizeof(char*));
212
212
 
213
213
  if (check_string_copy_error(this, well_formed_error_pos,
214
214
                              cannot_convert_error_pos, from + length, cs))