~daniel-nichter/drizzle/fix-slave-reconnect-bug-956200

« back to all changes in this revision

Viewing changes to drizzled/identifier/constants/schema.cc

  • Committer: Continuous Integration
  • Date: 2012-04-23 09:10:11 UTC
  • mfrom: (2546.1.6 drizzle-greenlake)
  • Revision ID: ci@drizzle.org-20120423091011-occ5xj26cv99opu6
modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
{
31
31
public:
32
32
  Schema(const char* name) :
33
 
    identifier::Schema(str_ref(name)),
34
 
    path_(boost::to_lower_copy(getSchemaName()))
35
 
  {
36
 
  }
37
 
 
38
 
  const std::string& getPath() const
39
 
  {
40
 
    return path_;
 
33
    identifier::Schema(str_ref(name))
 
34
  {
41
35
  }
42
36
 
43
37
  bool isSystem() const
46
40
  }
47
41
 
48
42
private:
49
 
  std::string path_;
50
43
};
51
44
 
52
45
} /* namespace constants */
53
46
 
54
 
static constants::Schema g_dd= "DATA_DICTIONARY";
55
 
static constants::Schema g_is= "INFORMATION_SCHEMA";
56
47
 
57
48
const Schema& data_dictionary()
58
49
{
 
50
  static constants::Schema g_dd= "DATA_DICTIONARY";
59
51
  return g_dd;
60
52
}
61
53
 
62
54
const Schema& information_schema()
63
55
{
 
56
  static constants::Schema g_is= "INFORMATION_SCHEMA";
64
57
  return g_is;
65
58
}
66
59