← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_dynrec.cc

  • Committer: tdavies
  • Date: 2010-10-13 01:29:12 UTC
  • mto: (1842.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1843.
  • Revision ID: tdavies@molly-20101013012912-vl72hg1y99qgqz5m
File: /drizzled/xid.h. Changed struct name of 'st_drizzle_xid' to 'drizzle_xid', changed it to a C++ class and added constructor initialization list 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_dynrec.cc
997
997
      }
998
998
      else if (type == FIELD_VARCHAR)
999
999
      {
1000
 
        uint32_t pack_length= ha_varchar_packlength(rec->length -1);
 
1000
        uint32_t pack_length= HA_VARCHAR_PACKLENGTH(rec->length -1);
1001
1001
        uint32_t tmp_length;
1002
1002
        if (pack_length == 1)
1003
1003
        {
1117
1117
      }
1118
1118
      else if (type == FIELD_VARCHAR)
1119
1119
      {
1120
 
        uint32_t pack_length= ha_varchar_packlength(rec->length -1);
 
1120
        uint32_t pack_length= HA_VARCHAR_PACKLENGTH(rec->length -1);
1121
1121
        uint32_t tmp_length;
1122
1122
        if (pack_length == 1)
1123
1123
        {
1190
1190
    {
1191
1191
      if (type == FIELD_VARCHAR)
1192
1192
      {
1193
 
        uint32_t pack_length= ha_varchar_packlength(rec_length-1);
 
1193
        uint32_t pack_length= HA_VARCHAR_PACKLENGTH(rec_length-1);
1194
1194
        if (pack_length == 1)
1195
1195
        {
1196
1196
          length= (uint) *(unsigned char*) from;