← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/sort.c

Merged in Jay's tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/sort.c
132
132
 
133
133
  while (memavl >= MIN_SORT_MEMORY)
134
134
  {
135
 
    if ((records < UINT_MAX32) && 
 
135
    if ((records < UINT32_MAX) && 
136
136
       ((my_off_t) (records + 1) * 
137
137
        (sort_length + sizeof(char*)) <= (my_off_t) memavl))
138
138
      keys= (uint)records+1;