← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/connection_id/connection_id.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/connection_id/connection_id.cc
68
68
 
69
69
plugin::Create_function<ConnectionIdFunction> *connection_idudf= NULL;
70
70
 
71
 
static int initialize(plugin::Registry &registry)
 
71
static int initialize(plugin::Context &context)
72
72
{
73
73
  connection_idudf=
74
74
    new plugin::Create_function<ConnectionIdFunction>("connection_id");
75
 
  registry.add(connection_idudf);
 
75
  context.add(connection_idudf);
76
76
  return 0;
77
77
}
78
78
 
79
 
static int finalize(plugin::Registry &registry)
80
 
{
81
 
   registry.remove(connection_idudf);
82
 
   delete connection_idudf;
83
 
   return 0;
84
 
}
85
 
 
86
79
DRIZZLE_DECLARE_PLUGIN
87
80
{
88
81
  DRIZZLE_VERSION_ID,
92
85
  "Return the current connection_id",
93
86
  PLUGIN_LICENSE_GPL,
94
87
  initialize, /* Plugin Init */
95
 
  finalize,   /* Plugin Deinit */
96
88
  NULL,   /* system variables */
97
89
  NULL    /* config options */
98
90
}