← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/dictionary.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/dictionary.cc
38
38
static ShowTemporaryTables *show_temporary_tables;
39
39
 
40
40
 
41
 
static int init(drizzled::plugin::Registry &registry)
 
41
static int init(drizzled::plugin::Context &context)
42
42
{
43
43
  columns= new(std::nothrow)ColumnsTool;
44
44
  index_parts= new(std::nothrow)IndexPartsTool;
54
54
  table_status= new(std::nothrow)ShowTableStatus;
55
55
  tables= new(std::nothrow)TablesTool;
56
56
 
57
 
  registry.add(columns);
58
 
  registry.add(index_parts);
59
 
  registry.add(indexes);
60
 
  registry.add(local_tables);
61
 
  registry.add(referential_constraints);
62
 
  registry.add(schema_names);
63
 
  registry.add(schemas);
64
 
  registry.add(show_columns);
65
 
  registry.add(show_indexes);
66
 
  registry.add(show_temporary_tables);
67
 
  registry.add(table_constraints);
68
 
  registry.add(table_status);
69
 
  registry.add(tables);
 
57
  context.add(columns);
 
58
  context.add(index_parts);
 
59
  context.add(indexes);
 
60
  context.add(local_tables);
 
61
  context.add(referential_constraints);
 
62
  context.add(schema_names);
 
63
  context.add(schemas);
 
64
  context.add(show_columns);
 
65
  context.add(show_indexes);
 
66
  context.add(show_temporary_tables);
 
67
  context.add(table_constraints);
 
68
  context.add(table_status);
 
69
  context.add(tables);
70
70
  
71
71
  return 0;
72
72
}
73
73
 
74
 
static int finalize(drizzled::plugin::Registry &registry)
75
 
{
76
 
  registry.remove(columns);
77
 
  registry.remove(index_parts);
78
 
  registry.remove(indexes);
79
 
  registry.remove(local_tables);
80
 
  registry.remove(referential_constraints);
81
 
  registry.remove(schema_names);
82
 
  registry.remove(schemas);
83
 
  registry.remove(show_columns);
84
 
  registry.remove(show_indexes);
85
 
  registry.remove(show_temporary_tables);
86
 
  registry.remove(table_constraints);
87
 
  registry.remove(table_status);
88
 
  registry.remove(tables);
89
 
  delete columns;
90
 
  delete index_parts;
91
 
  delete indexes;
92
 
  delete local_tables;
93
 
  delete referential_constraints;
94
 
  delete schema_names;
95
 
  delete schemas;
96
 
  delete show_columns;
97
 
  delete show_indexes;
98
 
  delete show_temporary_tables;
99
 
  delete table_constraints;
100
 
  delete table_status;
101
 
  delete tables;
102
 
 
103
 
  return 0;
104
 
}
105
 
 
106
74
DRIZZLE_DECLARE_PLUGIN
107
75
{
108
76
  DRIZZLE_VERSION_ID,
112
80
  "Data Dictionary for schema, table, column, indexes, etc",
113
81
  PLUGIN_LICENSE_GPL,
114
82
  init,
115
 
  finalize,
116
83
  NULL,
117
84
  NULL
118
85
}