← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
219
219
 
220
220
  if (from == value.ptr())
221
221
  {
222
 
    uint32_t dummy_offset;
 
222
    size_t dummy_offset;
223
223
    if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
224
224
    {
225
225
      Field_blob::store_length(length);