← 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-10-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
437
437
    }
438
438
    memcpy(&blob,ptr+sizeof(uint32_t),sizeof(char*));
439
439
 
440
 
    blob_length= field_charset->strnxfrm(to, length, blob, blob_length);
 
440
    blob_length=my_strnxfrm(field_charset,
 
441
                            to, length, blob, blob_length);
441
442
    assert(blob_length == length);
442
443
  }
443
444
}