← 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: 2010-03-03 19:14:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1321.
  • Revision ID: brian@gaz-20100303191446-wwyb21pld8jgtjw6
Move proto file write into createTable() (where it obviously belongs).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2051
2051
    protoengine->set_name(create_table_proto.engine().name());
2052
2052
  }
2053
2053
 
2054
 
  if (protoerr == EEXIST)
2055
 
  {
2056
 
    plugin::StorageEngine* engine= plugin::StorageEngine::findByName(session,
2057
 
                                                                     new_proto.engine().name());
2058
 
 
2059
 
    if (engine->check_flag(HTON_BIT_HAS_DATA_DICTIONARY) == false)
2060
 
    {
2061
 
      string dst_proto_path(destination_identifier.getPath());
2062
 
      dst_proto_path.append(".dfe");
2063
 
 
2064
 
      protoerr= drizzle_write_proto_file(dst_proto_path.c_str(), new_proto);
2065
 
    }
2066
 
    else
2067
 
    {
2068
 
      protoerr= 0;
2069
 
    }
2070
 
  }
2071
 
 
2072
 
  if (protoerr)
 
2054
  if (protoerr && protoerr != EEXIST)
2073
2055
  {
2074
2056
    if (errno == ENOENT)
2075
2057
      my_error(ER_BAD_DB_ERROR,MYF(0), destination_identifier.getSchemaName());