← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/sort.cc

  • Committer: Monty Taylor
  • Date: 2011-03-07 23:39:05 UTC
  • mfrom: (2221.7.6 dynamic-array)
  • mto: This revision was merged to the branch mainline in revision 2224.
  • Revision ID: mordred@inaugust.com-20110307233905-ngm9tlekmk5jboow
Merge Olaf - Refactor DYNAMIC_ARRAY

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/sort.cc
288
288
  }
289
289
  if (error > 0)
290
290
    return(HA_POS_ERROR);
291
 
  if (buffpek->elements)
 
291
  if (buffpek->size())
292
292
  {
293
293
    if (info->write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),
294
294
                   tempfile))
295
295
      return(HA_POS_ERROR);
296
 
    *maxbuffer=buffpek->elements-1;
 
296
    *maxbuffer=buffpek->size() - 1;
297
297
  }
298
298
  else
299
299
    *maxbuffer=0;
330
330
    if (!got_error)
331
331
    {
332
332
      mi_set_key_active(share->state.key_map, sinfo->key);
333
 
      if (!sinfo->buffpek.elements)
 
333
      if (!sinfo->buffpek.size())
334
334
      {
335
335
        if (param->testflag & T_VERBOSE)
336
336
        {
375
375
      sinfo->read_to_buffer=read_to_buffer;
376
376
      sinfo->write_key=write_merge_key;
377
377
    }
378
 
    if (sinfo->buffpek.elements)
 
378
    if (sinfo->buffpek.size())
379
379
    {
380
 
      size_t maxbuffer=sinfo->buffpek.elements-1;
 
380
      size_t maxbuffer=sinfo->buffpek.size() - 1;
381
381
      if (!mergebuf)
382
382
      {
383
383
        length=param->sort_buffer_length;