← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.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/drizzle_protocol/drizzle_protocol.cc
814
814
 
815
815
static ListenDrizzleProtocol *listen_obj= NULL;
816
816
 
817
 
static int init(plugin::Registry &registry)
 
817
static int init(plugin::Context &context)
818
818
{
819
819
  listen_obj= new ListenDrizzleProtocol("drizzle_protocol", false);
820
 
  registry.add(listen_obj); 
821
 
  return 0;
822
 
}
823
 
 
824
 
static int deinit(plugin::Registry &registry)
825
 
{
826
 
  registry.remove(listen_obj);
827
 
  delete listen_obj;
 
820
  context.add(listen_obj); 
828
821
  return 0;
829
822
}
830
823
 
862
855
 
863
856
} /* namespace drizzle_protocol */
864
857
 
865
 
DRIZZLE_PLUGIN(drizzle_protocol::init, drizzle_protocol::deinit, drizzle_protocol::sys_variables);
 
858
DRIZZLE_PLUGIN(drizzle_protocol::init, drizzle_protocol::sys_variables);