← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/function_engine/function.cc

Merge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/function_engine/function.cc
126
126
 
127
127
static drizzled::plugin::StorageEngine *function_plugin= NULL;
128
128
 
129
 
static int init(drizzled::plugin::Registry &registry)
 
129
static int init(drizzled::plugin::Context &context)
130
130
{
131
131
  function_plugin= new(std::nothrow) Function("FunctionEngine");
132
132
 
135
135
    return 1;
136
136
  }
137
137
 
138
 
  registry.add(function_plugin);
139
 
 
140
 
  return 0;
141
 
}
142
 
 
143
 
static int finalize(drizzled::plugin::Registry &registry)
144
 
{
145
 
  registry.remove(function_plugin);
146
 
  delete function_plugin;
 
138
  context.add(function_plugin);
147
139
 
148
140
  return 0;
149
141
}
157
149
  "Function Engine provides the infrastructure for Table Functions,etc.",
158
150
  PLUGIN_LICENSE_GPL,
159
151
  init,     /* Plugin Init */
160
 
  finalize,     /* Plugin Deinit */
161
152
  NULL,               /* system variables */
162
153
  NULL                /* config options   */
163
154
}