← 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-06-29 21:22:35 UTC
  • Revision ID: brian@gaz-20100629212235-egrke8446lndm2iz
This adds const to SchemaIdentifier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
562
562
  public unary_function<StorageEngine *, void>
563
563
{
564
564
  CachedDirectory &directory;
565
 
  SchemaIdentifier &identifier;
 
565
  const SchemaIdentifier &identifier;
566
566
  TableNameList &set_of_names;
567
567
 
568
568
public:
569
569
 
570
 
  AddTableName(CachedDirectory &directory_arg, SchemaIdentifier &identifier_arg, set<string>& of_names) :
 
570
  AddTableName(CachedDirectory &directory_arg, const SchemaIdentifier &identifier_arg, set<string>& of_names) :
571
571
    directory(directory_arg),
572
572
    identifier(identifier_arg),
573
573
    set_of_names(of_names)
584
584
  public unary_function<StorageEngine *, void>
585
585
{
586
586
  CachedDirectory &directory;
587
 
  SchemaIdentifier &identifier;
 
587
  const SchemaIdentifier &identifier;
588
588
  TableIdentifiers &set_of_identifiers;
589
589
 
590
590
public:
591
591
 
592
 
  AddTableIdentifier(CachedDirectory &directory_arg, SchemaIdentifier &identifier_arg, TableIdentifiers &of_names) :
 
592
  AddTableIdentifier(CachedDirectory &directory_arg, const SchemaIdentifier &identifier_arg, TableIdentifiers &of_names) :
593
593
    directory(directory_arg),
594
594
    identifier(identifier_arg),
595
595
    set_of_identifiers(of_names)
606
606
static SchemaIdentifier INFORMATION_SCHEMA_IDENTIFIER("information_schema");
607
607
static SchemaIdentifier DATA_DICTIONARY_IDENTIFIER("data_dictionary");
608
608
 
609
 
void StorageEngine::getTableNames(Session &session, SchemaIdentifier &schema_identifier, TableNameList &set_of_names)
 
609
void StorageEngine::getTableNames(Session &session, const SchemaIdentifier &schema_identifier, TableNameList &set_of_names)
610
610
{
611
611
  CachedDirectory directory(schema_identifier.getPath(), set_of_table_definition_ext);
612
612
 
620
620
    {
621
621
      errno= directory.getError();
622
622
      if (errno == ENOENT)
623
 
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), schema_identifier.getSQLPath().c_str());
 
623
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), const_cast<SchemaIdentifier &>(schema_identifier).getSQLPath().c_str());
624
624
      else
625
625
        my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), directory.getPath(), errno);
626
626
      return;
633
633
  session.doGetTableNames(directory, schema_identifier, set_of_names);
634
634
}
635
635
 
636
 
void StorageEngine::getTableIdentifiers(Session &session, SchemaIdentifier &schema_identifier, TableIdentifiers &set_of_identifiers)
 
636
void StorageEngine::getTableIdentifiers(Session &session, const SchemaIdentifier &schema_identifier, TableIdentifiers &set_of_identifiers)
637
637
{
638
638
  CachedDirectory directory(schema_identifier.getPath(), set_of_table_definition_ext);
639
639
 
647
647
    {
648
648
      errno= directory.getError();
649
649
      if (errno == ENOENT)
650
 
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), schema_identifier.getSQLPath().c_str());
 
650
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), const_cast<SchemaIdentifier &>(schema_identifier).getSQLPath().c_str());
651
651
      else
652
652
        my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), directory.getPath(), errno);
653
653
      return;