← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_qsort.cc

  • Committer: Eric Herman
  • Date: 2008-12-06 22:37:37 UTC
  • mfrom: (656.1.6 devel)
  • mto: (656.1.8 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: eric@mysql.com-20081206223737-viem01l5uhm0w14r
merged from lp:drizzle/mordred

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_qsort.cc
110
110
  /* The first element in the stack will be accessed for the last POP */
111
111
  stack[0].low=stack[0].high=0;
112
112
#endif
113
 
  pivot = (char *) my_alloca((int) size);
 
113
  pivot = (char *) malloc(size);
114
114
  ptr_cmp= size == sizeof(char*) && !((low - (char*) 0)& (sizeof(char*)-1));
115
115
 
116
116
  /* The following loop sorts elements between high and low */
209
209
      high = high_ptr;
210
210
    }
211
211
  } while (stack_ptr > stack);
212
 
  my_afree(pivot);
 
212
  free(pivot);
213
213
  SORT_RETURN;
214
214
}