← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/sort.c

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/sort.c
120
120
 
121
121
  my_b_clear(&tempfile);
122
122
  my_b_clear(&tempfile_for_exceptions);
123
 
  memset((char*) &buffpek, 0, sizeof(buffpek));
 
123
  memset(&buffpek, 0, sizeof(buffpek));
124
124
  sort_keys= (uchar **) NULL; error= 1;
125
125
  maxbuffer=1;
126
126
 
329
329
 
330
330
    my_b_clear(&sort_param->tempfile);
331
331
    my_b_clear(&sort_param->tempfile_for_exceptions);
332
 
    memset((char*) &sort_param->buffpek, 0, sizeof(sort_param->buffpek));
333
 
    memset((char*) &sort_param->unique, 0,  sizeof(sort_param->unique));
 
332
    memset(&sort_param->buffpek, 0, sizeof(sort_param->buffpek));
 
333
    memset(&sort_param->unique, 0,  sizeof(sort_param->unique));
334
334
    sort_keys= (uchar **) NULL;
335
335
 
336
336
    memavl=       max(sort_param->sortbuff_size, MIN_SORT_MEMORY);