← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/myxt_xt.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/pbxt/src/myxt_xt.cc
686
686
                case MYSQL_TYPE_VARCHAR: {
687
687
                        uint length;
688
688
 
689
 
                        if (((Field_varstring *) field)->length_bytes == 1)
 
689
                        if (((Field_varstring *) field)->pack_length_no_ptr() == 1)
690
690
                                length = *((unsigned char *) from);
691
691
                        else
692
692
                                length = uint2korr(from);
693
693
                        
694
694
                        *len = length;
695
 
                        return from+((Field_varstring *) field)->length_bytes;
 
695
                        return from+((Field_varstring *) field)->pack_length_no_ptr();
696
696
                }
697
697
#ifndef DRIZZLED
698
698
                case MYSQL_TYPE_DECIMAL:
798
798
                        return;
799
799
#endif
800
800
                case MYSQL_TYPE_VARCHAR:
801
 
                        if (((Field_varstring *) field)->length_bytes == 1)
 
801
                        if (((Field_varstring *) field)->pack_length_no_ptr() == 1)
802
802
                                *((unsigned char *) from) = (unsigned char) len;
803
803
                        else
804
804
                                int2store(from, len);
805
805
                        if (data) {
806
806
                                mx_set_notnull_in_record(table, field, dest);
807
 
                                memcpy(from+((Field_varstring *) field)->length_bytes, data, len);
 
807
                                memcpy(from+((Field_varstring *) field)->pack_length_no_ptr(), data, len);
808
808
                        }
809
809
                        return;
810
810
#ifndef DRIZZLED