← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memory/ha_heap.cc

  • Committer: lbieber
  • Date: 2010-09-23 15:49:15 UTC
  • mfrom: (1788.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100923154915-mshh9pwln0igdwrn
Merge Brian - Rollup patch of enum + style on varchar. This modifies enum to always being the same value.
Merge Stewart - Fix embedded_innodb plugin now that TIMESTAMP is 8 bytes. 
Merge Shrews - fix bug 643630 -  Transaction_reader not handling CHAR values that include quotes properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memory/ha_heap.cc
738
738
      next_field_pos= seg->start + seg->length;
739
739
      if (field->type() == DRIZZLE_TYPE_VARCHAR)
740
740
      {
741
 
        next_field_pos+= (uint8_t)(((Field_varstring*)field)->length_bytes);
 
741
        next_field_pos+= (uint8_t)(((Field_varstring*)field)->pack_length_no_ptr());
742
742
      }
743
743
 
744
744
      if (next_field_pos > key_part_size) {