← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Brian Aker
  • Date: 2011-02-03 18:12:09 UTC
  • mfrom: (2134.1.9 timestamp)
  • mto: This revision was merged to the branch mainline in revision 2140.
  • Revision ID: brian@tangent.org-20110203181209-xr7i2079pdmu33hd
Merge in table tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
672
672
    if (from_length != to_length || !compatible_db_low_byte_first)
673
673
    {
674
674
      // Correct pointer to point at char pointer
675
 
      to_ptr+= to_length - to->getTable()->getShare()->blob_ptr_size;
676
 
      from_ptr+= from_length- from->getTable()->getShare()->blob_ptr_size;
 
675
      to_ptr+= to_length - to->getTable()->getShare()->sizeBlobPtr();
 
676
      from_ptr+= from_length- from->getTable()->getShare()->sizeBlobPtr();
677
677
      return do_copy_blob;
678
678
    }
679
679
  }