← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Lee Bieber
  • Date: 2011-01-26 04:38:57 UTC
  • mfrom: (2115.1.2 drizzle-build)
  • Revision ID: kalebral@gmail.com-20110126043857-d5oegxrszux47793
Merge Brian - Merge in latest catalog changes
Merge Brian remove error numbers in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
400
400
  COND_thread_count.notify_all();
401
401
 
402
402
  /* Wait until cleanup is done */
403
 
  {
404
 
    boost::mutex::scoped_lock scopedLock(session::Cache::singleton().mutex());
405
 
 
406
 
    while (not ready_to_exit)
407
 
    {
408
 
      COND_server_end.wait(scopedLock);
409
 
    }
410
 
  }
 
403
  session::Cache::singleton().shutdownSecond();
411
404
 
412
405
  clean_up(1);
413
406
  module::Registry::shutdown();