← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

merge for-brian work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
3034
3034
 
3035
3035
    char path[FN_REFLEN];
3036
3036
    build_table_filename(path, sizeof(path),
3037
 
                         db, name, ".dfe", 0);
3038
 
    if (!access(path, F_OK))
 
3037
                         db, name, "", 0);
 
3038
    if (table_proto_exists(path)==EEXIST)
3039
3039
      args.err= HA_ERR_TABLE_EXIST;
3040
3040
    else
3041
3041
      args.err= HA_ERR_NO_SUCH_TABLE;
3043
3043
    if(args.err==HA_ERR_TABLE_EXIST)
3044
3044
    {
3045
3045
      drizzle::Table table;
 
3046
      build_table_filename(path, sizeof(path),
 
3047
                           db, name, ".dfe", 0);
3046
3048
      if(drizzle_read_table_proto(path, &table)==0)
3047
3049
      {
3048
3050
        LEX_STRING engine_name= { (char*)table.engine().name().c_str(),