← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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/sql_base.cc
45
45
inline bool is_user_table(Table * table)
46
46
{
47
47
  const char *name= table->s->table_name.str;
48
 
  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
 
48
  return strncmp(name, TMP_FILE_PREFIX, TMP_FILE_PREFIX_LENGTH);
49
49
}
50
50
 
51
51
 
3857
3857
  handler *file;
3858
3858
  char *ext;
3859
3859
 
 
3860
  delete_table_proto_file(path);
 
3861
 
3860
3862
  my_stpcpy(ext= strchr(path, '\0'), reg_ext);
3861
3863
  if (my_delete(path,MYF(0)))
3862
3864
    error=1; /* purecov: inspected */
6246
6248
                                   (file->name[1] == '.' &&  !file->name[2])))
6247
6249
        continue;
6248
6250
 
6249
 
      if (!memcmp(file->name, tmp_file_prefix, tmp_file_prefix_length))
 
6251
      if (!memcmp(file->name, TMP_FILE_PREFIX, TMP_FILE_PREFIX_LENGTH))
6250
6252
      {
6251
6253
        char *ext= fn_ext(file->name);
6252
6254
        uint32_t ext_len= strlen(ext);