← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
422
422
 
423
423
void Session::awake(Session::killed_state_t state_to_set)
424
424
{
 
425
  if ((state_to_set == Session::KILL_QUERY) and (command == COM_SLEEP))
 
426
    return;
 
427
 
425
428
  this->checkSentry();
426
429
 
427
430
  setKilled(state_to_set);