← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/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/table.cc
3760
3760
    temp_pool_slot = bitmap_lock_set_next(&temp_pool);
3761
3761
 
3762
3762
  if (temp_pool_slot != MY_BIT_NONE) // we got a slot
3763
 
    sprintf(path, "%s_%lx_%i", tmp_file_prefix,
 
3763
    sprintf(path, "%s_%lx_%i", TMP_FILE_PREFIX,
3764
3764
            current_pid, temp_pool_slot);
3765
3765
  else
3766
3766
  {
3767
3767
    /* if we run out of slots or we are not using tempool */
3768
 
    sprintf(path,"%s%lx_%"PRIx64"_%x", tmp_file_prefix,current_pid,
 
3768
    sprintf(path,"%s%lx_%"PRIx64"_%x", TMP_FILE_PREFIX, current_pid,
3769
3769
            session->thread_id, session->tmp_table++);
3770
3770
  }
3771
3771