← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2010-07-20 01:23:40 UTC
  • mto: This revision was merged to the branch mainline in revision 1665.
  • Revision ID: brian@gaz-20100720012340-unsredwj0ubf69k5
Remove table names options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
558
558
  return create(share, alloc);
559
559
}
560
560
 
561
 
class AddTableName : 
562
 
  public unary_function<StorageEngine *, void>
563
 
{
564
 
  CachedDirectory &directory;
565
 
  const SchemaIdentifier &identifier;
566
 
  TableNameList &set_of_names;
567
 
 
568
 
public:
569
 
 
570
 
  AddTableName(CachedDirectory &directory_arg, const SchemaIdentifier &identifier_arg, set<string>& of_names) :
571
 
    directory(directory_arg),
572
 
    identifier(identifier_arg),
573
 
    set_of_names(of_names)
574
 
  {
575
 
  }
576
 
 
577
 
  result_type operator() (argument_type engine)
578
 
  {
579
 
    engine->doGetTableNames(directory, identifier, set_of_names);
580
 
  }
581
 
};
582
 
 
583
561
class AddTableIdentifier : 
584
562
  public unary_function<StorageEngine *, void>
585
563
{
606
584
static SchemaIdentifier INFORMATION_SCHEMA_IDENTIFIER("information_schema");
607
585
static SchemaIdentifier DATA_DICTIONARY_IDENTIFIER("data_dictionary");
608
586
 
609
 
void StorageEngine::getTableNames(Session &session, const SchemaIdentifier &schema_identifier, TableNameList &set_of_names)
610
 
{
611
 
  CachedDirectory directory(schema_identifier.getPath(), set_of_table_definition_ext);
612
 
 
613
 
  if (schema_identifier == INFORMATION_SCHEMA_IDENTIFIER)
614
 
  { }
615
 
  else if (schema_identifier == DATA_DICTIONARY_IDENTIFIER)
616
 
  { }
617
 
  else
618
 
  {
619
 
    if (directory.fail())
620
 
    {
621
 
      errno= directory.getError();
622
 
      if (errno == ENOENT)
623
 
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), const_cast<SchemaIdentifier &>(schema_identifier).getSQLPath().c_str());
624
 
      else
625
 
        my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), directory.getPath(), errno);
626
 
      return;
627
 
    }
628
 
  }
629
 
 
630
 
  for_each(vector_of_engines.begin(), vector_of_engines.end(),
631
 
           AddTableName(directory, schema_identifier, set_of_names));
632
 
 
633
 
  session.doGetTableNames(directory, schema_identifier, set_of_names);
634
 
}
635
 
 
636
587
void StorageEngine::getTableIdentifiers(Session &session, const SchemaIdentifier &schema_identifier, TableIdentifiers &set_of_identifiers)
637
588
{
638
589
  CachedDirectory directory(schema_identifier.getPath(), set_of_table_definition_ext);