← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2010-11-03 16:49:41 UTC
  • mfrom: (1900 merge)
  • mto: This revision was merged to the branch mainline in revision 1902.
  • Revision ID: brian@tangent.org-20101103164941-bil4aktjwrm3jo8a
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
335
335
  /* Send server startup event */
336
336
  if ((session= new Session(plugin::Listen::getNullClient())))
337
337
  {
 
338
    currentSession().release();
 
339
    currentSession().reset(session);
338
340
    transaction_services.sendStartupEvent(session);
339
341
    session->lockForDelete();
340
342
    delete session;
360
362
  /* Send server shutdown event */
361
363
  if ((session= new Session(plugin::Listen::getNullClient())))
362
364
  {
 
365
    currentSession().release();
 
366
    currentSession().reset(session);
363
367
    transaction_services.sendShutdownEvent(session);
364
368
    session->lockForDelete();
365
369
    delete session;