← 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-12-15 18:33:47 UTC
  • Revision ID: brian@tangent.org-20081215183347-lh2u71xmjpmj3qz0
Remove locks around temp tables for searching tmp directory path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/sort.c
633
633
  my_qsort2((unsigned char*) sort_keys,count,sizeof(unsigned char*),(qsort2_cmp) info->key_cmp,
634
634
            info);
635
635
  if (!my_b_inited(tempfile) &&
636
 
      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
 
636
      open_cached_file(tempfile, P_tmpdir, "ST",
637
637
                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
638
638
    return(1); /* purecov: inspected */
639
639
 
675
675
  my_qsort2((unsigned char*) sort_keys,count,sizeof(unsigned char*),(qsort2_cmp) info->key_cmp,
676
676
            info);
677
677
  if (!my_b_inited(tempfile) &&
678
 
      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
 
678
      open_cached_file(tempfile, P_tmpdir, "ST",
679
679
                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
680
680
    return(1); /* purecov: inspected */
681
681
 
696
696
  uint32_t key_length=info->real_key_length;
697
697
 
698
698
  if (!my_b_inited(tempfile) &&
699
 
      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
 
699
      open_cached_file(tempfile, P_tmpdir, "ST",
700
700
                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
701
701
    return(1);
702
702
 
736
736
  if (*maxbuffer < MERGEBUFF2)
737
737
    return(0);                             /* purecov: inspected */
738
738
  if (flush_io_cache(t_file) ||
739
 
      open_cached_file(&t_file2,my_tmpdir(info->tmpdir),"ST",
 
739
      open_cached_file(&t_file2, P_tmpdir, "ST",
740
740
                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
741
741
    return(1);                             /* purecov: inspected */
742
742