~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/sort.cc

  • Committer: Monty Taylor
  • Date: 2009-03-21 20:32:38 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: mordred@inaugust.com-20090321203238-vwxddmm02qa14yrz
Moved MyISAM files to C++ so we can continue to consolidate code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
550
550
        length=param->sort_buffer_length;
551
551
        while (length >= MIN_SORT_MEMORY)
552
552
        {
553
 
          if ((mergebuf= malloc(length)))
 
553
          if ((mergebuf= (unsigned char *)malloc(length)))
554
554
              break;
555
555
          length=length*3/4;
556
556
        }