← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/sort.cc

  • Committer: Lee Bieber
  • Date: 2011-03-02 16:42:17 UTC
  • mfrom: (2213.1.4 build)
  • Revision ID: kalebral@gmail.com-20110302164217-3svex1wt5yj5n2th
Merge Derks  712194: Add default plugin configs to source 
Merge Patrick - 727506: Can't run dbqp on rhel 5.5
Merge Shrews - 720433: 'replication' schema being used vs. actual schema for certain INSERTs with the slave-plugin
Merge Olaf - Refactor dynamic_array

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/sort.cc
199
199
    {
200
200
      if (!no_messages)
201
201
        printf("  - Merging %u keys\n", (uint32_t) records);
202
 
      if (merge_many_buff(info,keys,sort_keys,
203
 
                  dynamic_element(&buffpek,0,BUFFPEK *),&maxbuffer,&tempfile))
 
202
      if (merge_many_buff(info,keys,sort_keys, (BUFFPEK*)buffpek.buffer, &maxbuffer, &tempfile))
204
203
        goto err;
205
204
    }
206
205
    if (internal::flush_io_cache(&tempfile) ||
208
207
      goto err;
209
208
    if (!no_messages)
210
209
      printf("  - Last merge and dumping keys\n");
211
 
    if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
212
 
                    maxbuffer,&tempfile))
 
210
    if (merge_index(info,keys,sort_keys, (BUFFPEK*)buffpek.buffer, maxbuffer, &tempfile))
213
211
      goto err;
214
212
  }
215
213
 
400
398
      {
401
399
        if (param->testflag & T_VERBOSE)
402
400
          printf("Key %d  - Merging %u keys\n",sinfo->key+1, sinfo->keys);
403
 
        if (merge_many_buff(sinfo, keys, (unsigned char **)mergebuf,
404
 
                            dynamic_element(&sinfo->buffpek, 0, BUFFPEK *),
 
401
        if (merge_many_buff(sinfo, keys, (unsigned char **)mergebuf, (BUFFPEK*)sinfo->buffpek.buffer,
405
402
                            &maxbuffer, &sinfo->tempfile))
406
403
        {
407
404
          got_error=1;
415
412
      }
416
413
      if (param->testflag & T_VERBOSE)
417
414
        printf("Key %d  - Last merge and dumping keys\n", sinfo->key+1);
418
 
      if (merge_index(sinfo, keys, (unsigned char **)mergebuf,
419
 
                      dynamic_element(&sinfo->buffpek,0,BUFFPEK *),
 
415
      if (merge_index(sinfo, keys, (unsigned char **)mergebuf, (BUFFPEK*)sinfo->buffpek.buffer,
420
416
                      maxbuffer,&sinfo->tempfile) ||
421
417
          flush_pending_blocks(sinfo))
422
418
      {