← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/records.cc

  • Committer: lbieber
  • Date: 2010-09-11 00:47:34 UTC
  • mfrom: (1756.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100911004734-m5kvdu6q2nq0u43w
Merge Brian - cppcheck fixes and also modifies unique lookup such that we let the OS handle paging for unique checking (instead of trying to mimic it through using a self built IO_CACHE).
Merge Andrew - fix test result for embedded_innodb 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/records.cc
420
420
 
421
421
static int rr_from_cache(ReadRecord *info)
422
422
{
423
 
  register uint32_t i;
424
423
  uint32_t length;
425
424
  internal::my_off_t rest_of_file;
426
425
  int16_t error;
460
459
    length/=info->ref_length;
461
460
    position=info->getCache();
462
461
    ref_position=info->read_positions;
463
 
    for (i=0 ; i < length ; i++,position+=info->ref_length)
 
462
    for (uint32_t i= 0 ; i < length ; i++,position+=info->ref_length)
464
463
    {
465
464
      memcpy(ref_position,position,(size_t) info->ref_length);
466
465
      ref_position+=MAX_REFLENGTH;
471
470
                       (qsort_cmp) rr_cmp);
472
471
 
473
472
    position=info->read_positions;
474
 
    for (i=0 ; i < length ; i++)
 
473
    for (uint32_t i= 0 ; i < length ; i++)
475
474
    {
476
475
      memcpy(info->ref_pos, position, (size_t)info->ref_length);
477
476
      position+=MAX_REFLENGTH;