← 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-24 16:27:10 UTC
  • Revision ID: brian@tangent.org-20081124162710-8gusydle39009rkq
Remove dead lex structure and clean up use of pid_t

Show diffs side-by-side

added added

removed removed

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