← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2010-05-21 20:29:54 UTC
  • mfrom: (1556.1.1 new-tmp)
  • Revision ID: brian@gaz-20100521202954-kdue0ulbeo7uqz9r
Merge of temp directory change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
260
260
    my_error(ER_OUT_OF_SORTMEMORY,MYF(ME_ERROR+ME_WAITTANG));
261
261
    goto err;
262
262
  }
263
 
  if (open_cached_file(&buffpek_pointers,drizzle_tmpdir,TEMP_PREFIX,
 
263
  if (open_cached_file(&buffpek_pointers,drizzle_tmpdir.c_str(),TEMP_PREFIX,
264
264
                       DISK_BUFFER_SIZE, MYF(MY_WME)))
265
265
    goto err;
266
266
 
295
295
    close_cached_file(&buffpek_pointers);
296
296
        /* Open cached file if it isn't open */
297
297
    if (! my_b_inited(outfile) &&
298
 
        open_cached_file(outfile,drizzle_tmpdir,TEMP_PREFIX,READ_RECORD_BUFFER,
 
298
        open_cached_file(outfile,drizzle_tmpdir.c_str(),TEMP_PREFIX,READ_RECORD_BUFFER,
299
299
                          MYF(MY_WME)))
300
300
      goto err;
301
301
    if (reinit_io_cache(outfile,internal::WRITE_CACHE,0L,0,0))
667
667
  rec_length= param->rec_length;
668
668
  internal::my_string_ptr_sort((unsigned char*) sort_keys, (uint32_t) count, sort_length);
669
669
  if (!my_b_inited(tempfile) &&
670
 
      open_cached_file(tempfile, drizzle_tmpdir, TEMP_PREFIX, DISK_BUFFER_SIZE,
 
670
      open_cached_file(tempfile, drizzle_tmpdir.c_str(), TEMP_PREFIX, DISK_BUFFER_SIZE,
671
671
                       MYF(MY_WME)))
672
672
    goto err;
673
673
  /* check we won't have more buffpeks than we can possibly keep in memory */
1020
1020
  if (*maxbuffer < MERGEBUFF2)
1021
1021
    return(0);
1022
1022
  if (flush_io_cache(t_file) ||
1023
 
      open_cached_file(&t_file2,drizzle_tmpdir,TEMP_PREFIX,DISK_BUFFER_SIZE,
 
1023
      open_cached_file(&t_file2,drizzle_tmpdir.c_str(),TEMP_PREFIX,DISK_BUFFER_SIZE,
1024
1024
                        MYF(MY_WME)))
1025
1025
    return(1);
1026
1026