← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

Merge for staging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
793
793
  /* Check for legal operations against the Engine using the proto (if used) */
794
794
  if (proto_used)
795
795
  {
796
 
    if (table_proto.type() == message::Table::TEMPORARY && 
 
796
    if (table_proto.type() == message::Table::TEMPORARY &&
797
797
        share.storage_engine->check_flag(HTON_BIT_TEMPORARY_NOT_SUPPORTED) == true)
798
798
    {
799
799
      error= HA_ERR_UNSUPPORTED;
800
800
      goto err2;
801
801
    }
802
 
    else if (table_proto.type() != message::Table::TEMPORARY && 
 
802
    else if (table_proto.type() != message::Table::TEMPORARY &&
803
803
             share.storage_engine->check_flag(HTON_BIT_TEMPORARY_ONLY) == true)
804
804
    {
805
805
      error= HA_ERR_UNSUPPORTED;
822
822
 
823
823
    share.storage_engine->setTransactionReadWrite(session);
824
824
 
825
 
    error= share.storage_engine->doCreateTable(&session, 
 
825
    error= share.storage_engine->doCreateTable(&session,
826
826
                                               table_name_arg,
827
827
                                               table,
828
828
                                               table_proto);
1290
1290
  }
1291
1291
}
1292
1292
 
1293
 
 
1294
 
 
1295
1293
} /* namespace drizzled */