← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_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/sql_table.cc
232
232
 
233
233
  char *p= my_stpncpy(buff, drizzle_tmpdir, bufflen);
234
234
  snprintf(p, bufflen - (p - buff), "/%s%lx_%"PRIx64"_%x%s",
235
 
           TMP_FILE_PREFIX, current_pid,
 
235
           TMP_FILE_PREFIX, (unsigned long)current_pid,
236
236
           session->thread_id, session->tmp_table++, reg_ext);
237
237
 
238
238
  if (lower_case_table_names)
2311
2311
    goto end;                           // Can't use USE_FRM flag
2312
2312
 
2313
2313
  snprintf(tmp, sizeof(tmp), "%s-%lx_%"PRIx64,
2314
 
           from, current_pid, session->thread_id);
 
2314
           from, (unsigned long)current_pid, session->thread_id);
2315
2315
 
2316
2316
  /* If we could open the table, close it */
2317
2317
  if (table_list->table)
3772
3772
  char path[FN_REFLEN];
3773
3773
 
3774
3774
  snprintf(tmp_name, sizeof(tmp_name), "%s-%lx_%"PRIx64,
3775
 
           TMP_FILE_PREFIX, current_pid, session->thread_id);
 
3775
           TMP_FILE_PREFIX, (unsigned long)current_pid, session->thread_id);
3776
3776
  /* Safety fix for InnoDB */
3777
3777
  if (lower_case_table_names)
3778
3778
    my_casedn_str(files_charset_info, tmp_name);
4810
4810
  }
4811
4811
 
4812
4812
  snprintf(tmp_name, sizeof(tmp_name), "%s-%lx_%"PRIx64, TMP_FILE_PREFIX,
4813
 
           current_pid, session->thread_id);
 
4813
           (unsigned long)current_pid, session->thread_id);
4814
4814
  /* Safety fix for innodb */
4815
4815
  if (lower_case_table_names)
4816
4816
    my_casedn_str(files_charset_info, tmp_name);
4933
4933
 
4934
4934
  session->set_proc_info("rename result table");
4935
4935
  snprintf(old_name, sizeof(old_name), "%s2-%lx-%"PRIx64, TMP_FILE_PREFIX,
4936
 
           current_pid, session->thread_id);
 
4936
           (unsigned long)current_pid, session->thread_id);
4937
4937
  if (lower_case_table_names)
4938
4938
    my_casedn_str(files_charset_info, old_name);
4939
4939