← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/plugin.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_engine/plugin.cc
29
29
 
30
30
static drizzled::plugin::StorageEngine *schema_plugin= NULL;
31
31
 
32
 
static int init(drizzled::plugin::Registry &registry)
 
32
static int init(drizzled::plugin::Context &context)
33
33
{
34
34
  schema_plugin= new(std::nothrow) Schema();
35
35
 
38
38
    return 1;
39
39
  }
40
40
 
41
 
  registry.add(schema_plugin);
42
 
 
43
 
  return 0;
44
 
}
45
 
 
46
 
static int finalize(drizzled::plugin::Registry &registry)
47
 
{
48
 
  registry.remove(schema_plugin);
49
 
  delete schema_plugin;
 
41
  context.add(schema_plugin);
50
42
 
51
43
  return 0;
52
44
}
60
52
  "This implements the default file based Schema engine.",
61
53
  PLUGIN_LICENSE_GPL,
62
54
  init,     /* Plugin Init */
63
 
  finalize,     /* Plugin Deinit */
64
55
  NULL,               /* system variables */
65
56
  NULL                /* config options   */
66
57
}