← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/dictionary.cc

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/collation_dictionary/dictionary.cc
26
26
static CharacterSetsTool *character_sets;
27
27
static CollationsTool *collations;
28
28
 
29
 
static int init(drizzled::module::Context &context)
 
29
static int init(drizzled::plugin::Registry &registry)
30
30
{
31
31
  character_sets= new(std::nothrow)CharacterSetsTool;
32
32
  collations= new(std::nothrow)CollationsTool;
33
33
 
34
 
  context.add(character_sets);
35
 
  context.add(collations);
 
34
  registry.add(character_sets);
 
35
  registry.add(collations);
36
36
  
37
37
  return 0;
38
38
}
39
39
 
 
40
static int finalize(drizzled::plugin::Registry &registry)
 
41
{
 
42
  registry.remove(character_sets);
 
43
  registry.remove(collations);
 
44
  delete character_sets;
 
45
  delete collations;
 
46
 
 
47
  return 0;
 
48
}
 
49
 
40
50
DRIZZLE_DECLARE_PLUGIN
41
51
{
42
52
  DRIZZLE_VERSION_ID,
46
56
  "Data Dictionary for schema, table, column, indexes, etc",
47
57
  PLUGIN_LICENSE_GPL,
48
58
  init,
 
59
  finalize,
49
60
  NULL,
50
61
  NULL
51
62
}