← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
160
160
 
161
161
  if (from == value.ptr())
162
162
  {
163
 
    size_t dummy_offset;
164
 
    if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
 
163
    if (!String::needs_conversion(length, cs, field_charset))
165
164
    {
166
165
      Field_blob::store_length(length);
167
166
      memmove(ptr+sizeof(uint32_t), &from, sizeof(char*));
257
256
  if (!blob)
258
257
    val_ptr->set("",0,charset());       // A bit safer than ->length(0)
259
258
  else
260
 
    val_ptr->set((const char*) blob,get_length(ptr),charset());
 
259
    val_ptr->set(blob,get_length(ptr),charset());
261
260
  return val_ptr;
262
261
}
263
262