← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/blitzdb/blitzcmp.cc

  • Committer: Stewart Smith
  • Date: 2010-11-05 05:11:21 UTC
  • mfrom: (1905 build)
  • mto: (1910.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1911.
  • Revision ID: stewart@flamingspork.com-20101105051121-cboftkqxzm993pm2
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/blitzdb/blitzcmp.cc
256
256
      a_next_offset = b_next_offset = curr_part->length;
257
257
      break;
258
258
    }
259
 
    case HA_KEYTYPE_VARTEXT1: {
260
 
      uint8_t a_varchar_len = *(uint8_t *)a_pos;
261
 
      uint8_t b_varchar_len = *(uint8_t *)b_pos;
262
 
      int key_changed;
263
 
 
264
 
      a_pos++;
265
 
      b_pos++;
266
 
 
267
 
      *a_compared_len += a_varchar_len + sizeof(a_varchar_len);
268
 
      *b_compared_len += b_varchar_len + sizeof(b_varchar_len);
269
 
 
270
 
      /* Compare the texts by respecting collation. */
271
 
      key_changed = my_strnncoll(&my_charset_utf8_general_ci,
272
 
                                 (unsigned char *)a_pos, a_varchar_len,
273
 
                                 (unsigned char *)b_pos, b_varchar_len);
274
 
      if (key_changed < 0)
275
 
        return -1;
276
 
      else if (key_changed > 0)
277
 
        return 1;
278
 
 
279
 
      a_next_offset = a_varchar_len;
280
 
      b_next_offset = b_varchar_len;
281
 
      break;
282
 
    }
 
259
    case HA_KEYTYPE_VARTEXT1:
283
260
    case HA_KEYTYPE_VARTEXT2: {
284
261
      uint16_t a_varchar_len = uint2korr(a_pos);
285
262
      uint16_t b_varchar_len = uint2korr(b_pos);