← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-187

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Stewart Smith
  • Date: 2012-07-11 14:06:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2574.
  • Revision ID: stewart@flamingspork.com-20120711140600-oxrs1cjabjuqpd05
force a identifier::Schema to be constructed with a identifier::Catalog. This is close to the final 'big' part for CATALOG support. We also have to modify all around the server that creates identifier::Schema so it does so properly. Since a single Session cannot span schemas, we get off a wee bit easy :) The big limitation in this patch is that INFORMATION_SCHEMA and DATA_DICTIONARY only appear in the LOCAL catalog (and this really needs to be fixed before CATALOGs other than LOCAL are supported).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
610
610
 
611
611
  if (search_string.compare("data_dictionary") == 0)
612
612
  {
613
 
    set_of_identifiers.push_back(identifier::Table(schema_identifier.getSchemaName(), "SYS_REPLICATION_LOG"));
 
613
    set_of_identifiers.push_back(identifier::Table(
 
614
                                            catalog::local_identifier(),
 
615
                                            schema_identifier.getSchemaName(),
 
616
                                            "SYS_REPLICATION_LOG"));
614
617
  }
615
618
 
616
619
  for (CachedDirectory::Entries::iterator entry_iter= entries.begin(); 
640
643
           Using schema_identifier here to stop unused warning, could use
641
644
           definition.schema() instead
642
645
        */
643
 
        identifier::Table identifier(schema_identifier.getSchemaName(), definition.name());
 
646
        identifier::Table identifier(schema_identifier, definition.name());
644
647
        set_of_identifiers.push_back(identifier);
645
648
      }
646
649
    }