← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/dictionary.cc

  • Committer: Brian Aker
  • Date: 2010-03-02 07:03:12 UTC
  • mfrom: (1309.2.10 drizzle-build)
  • Revision ID: brian@gaz-20100302070312-u8xyk09u2970pgzp
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/dictionary.cc
29
29
static ReferentialConstraintsTool *referential_constraints;
30
30
static SchemasTool *schemas;
31
31
static SchemaNames *schema_names;
 
32
static ShowColumns *show_columns;
 
33
static ShowIndexes *show_indexes;
32
34
static TableConstraintsTool *table_constraints;
33
35
static TablesTool *tables;
34
 
static TableNames *local_tables;
35
 
static TableStatus *table_status;
 
36
static ShowTables *local_tables;
 
37
static ShowTableStatus *table_status;
36
38
 
37
39
 
38
40
static int init(drizzled::plugin::Registry &registry)
42
44
  indexes= new(std::nothrow)IndexesTool;
43
45
  referential_constraints= new(std::nothrow)ReferentialConstraintsTool;
44
46
  schemas= new(std::nothrow)SchemasTool;
45
 
  local_tables= new(std::nothrow)TableNames;
 
47
  local_tables= new(std::nothrow)ShowTables;
46
48
  schema_names= new(std::nothrow)SchemaNames;
 
49
  show_indexes= new(std::nothrow)ShowIndexes;
 
50
  show_columns= new(std::nothrow)ShowColumns;
47
51
  table_constraints= new(std::nothrow)TableConstraintsTool;
48
 
  table_status= new(std::nothrow)TableStatus;
 
52
  table_status= new(std::nothrow)ShowTableStatus;
49
53
  tables= new(std::nothrow)TablesTool;
50
54
 
51
55
  registry.add(columns);
55
59
  registry.add(referential_constraints);
56
60
  registry.add(schema_names);
57
61
  registry.add(schemas);
 
62
  registry.add(show_indexes);
 
63
  registry.add(show_columns);
58
64
  registry.add(table_constraints);
59
65
  registry.add(table_status);
60
66
  registry.add(tables);
71
77
  registry.remove(referential_constraints);
72
78
  registry.remove(schema_names);
73
79
  registry.remove(schemas);
 
80
  registry.remove(show_indexes);
 
81
  registry.remove(show_columns);
74
82
  registry.remove(table_constraints);
75
83
  registry.remove(table_status);
76
84
  registry.remove(tables);
81
89
  delete referential_constraints;
82
90
  delete schema_names;
83
91
  delete schemas;
 
92
  delete show_columns;
 
93
  delete show_indexes;
84
94
  delete table_constraints;
85
95
  delete table_status;
86
96
  delete tables;