← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/sort.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/sort.c
130
130
 
131
131
  while (memavl >= MIN_SORT_MEMORY)
132
132
  {
133
 
    if ((records < UINT_MAX32) && 
 
133
    if ((records < UINT32_MAX) && 
134
134
       ((my_off_t) (records + 1) * 
135
135
        (sort_length + sizeof(char*)) <= (my_off_t) memavl))
136
136
      keys= (uint)records+1;
506
506
        update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,
507
507
                         param->stats_method == MI_STATS_METHOD_IGNORE_NULLS?
508
508
                         sinfo->notnull: NULL,
509
 
                         (ulonglong) info->state->records);
 
509
                         (uint64_t) info->state->records);
510
510
    }
511
511
    my_free((uchar*) sinfo->sort_keys,MYF(0));
512
512
    my_free(mi_get_rec_buff_ptr(info, sinfo->rec_buff),