← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2009-05-23 00:24:25 UTC
  • mfrom: (1034.1.7 merge)
  • Revision ID: brian@gaz-20090523002425-rd9slkqwe2ip0xkh
Merge of Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
215
215
         (unsigned char **) make_char_array((char **) table_sort.sort_keys,
216
216
                                            param.keys, param.rec_length)))
217
217
      break;
218
 
    old_memavl=memavl;
219
 
    if ((memavl=memavl/4*3) < min_sort_memory && old_memavl > min_sort_memory)
 
218
    old_memavl= memavl;
 
219
    if ((memavl= memavl/4*3) < min_sort_memory && old_memavl > min_sort_memory)
220
220
      memavl= min_sort_memory;
221
221
  }
222
222
  sort_keys= table_sort.sort_keys;