← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

merge for-brian work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
38
38
#define MY_DB_OPT_FILE "db.opt"
39
39
#define MAX_DROP_TABLE_Q_LEN      1024
40
40
 
41
 
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NULL};
 
41
const char *del_exts[]= {".dfe", ".BAK", ".TMD",".opt", NULL};
42
42
static TYPELIB deletable_extentions=
43
43
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
44
44
 
656
656
    }
657
657
    /* just for safety we use files_charset_info */
658
658
    if (db && !my_strcasecmp(files_charset_info,
659
 
                             extension, reg_ext))
 
659
                             extension, ".dfe"))
660
660
    {
661
661
      uint32_t db_len= strlen(db);
662
662
 
665
665
      TableList *table_list=(TableList*)
666
666
                              session->calloc(sizeof(*table_list) +
667
667
                                          db_len + 1 +
668
 
                                          MYSQL50_TABLE_NAME_PREFIX_LENGTH +
669
668
                                          strlen(file->name) + 1);
670
669
 
671
670
      if (!table_list)
673
672
      table_list->db= (char*) (table_list+1);
674
673
      table_list->table_name= strcpy(table_list->db, db) + db_len + 1;
675
674
      filename_to_tablename(file->name, table_list->table_name,
676
 
                            MYSQL50_TABLE_NAME_PREFIX_LENGTH +
677
675
                            strlen(file->name) + 1);
678
676
      table_list->alias= table_list->table_name;        // If lower_case_table_names=2
679
677
      table_list->internal_tmp_table= is_prefix(file->name, TMP_FILE_PREFIX);