← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sj_tmp_table.cc

  • Committer: Brian Aker
  • Date: 2008-11-16 02:03:36 UTC
  • mfrom: (584.2.8 drizzle-nofrm)
  • Revision ID: brian@tangent.org-20081116020336-89horp2vrgqoqv0f
Merge stewert

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sj_tmp_table.cc
82
82
    temp_pool_slot = bitmap_lock_set_next(&temp_pool);
83
83
 
84
84
  if (temp_pool_slot != MY_BIT_NONE) // we got a slot
85
 
    sprintf(path, "%s_%lx_%i", tmp_file_prefix,
 
85
    sprintf(path, "%s_%lx_%i", TMP_FILE_PREFIX,
86
86
            current_pid, temp_pool_slot);
87
87
  else
88
88
  {
89
89
    /* if we run out of slots or we are not using tempool */
90
 
    sprintf(path,"%s%lx_%"PRIx64"_%x", tmp_file_prefix,current_pid,
 
90
    sprintf(path,"%s%lx_%"PRIx64"_%x", TMP_FILE_PREFIX, current_pid,
91
91
            session->thread_id, session->tmp_table++);
92
92
  }
93
93
  fn_format(path, path, drizzle_tmpdir, "", MY_REPLACE_EXT|MY_UNPACK_FILENAME);