← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2010-12-18 00:43:02 UTC
  • Revision ID: brian@tangent.org-20101218004302-4ivzuuzdkblyqe18
Refactor naming for integers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
60
60
#include "drizzled/plugin/monitored_in_transaction.h"
61
61
#include "drizzled/replication_services.h" /* For ReplicationServices::evaluateRegisteredPlugins() */
62
62
#include "drizzled/probes.h"
63
 
#include "drizzled/session_list.h"
 
63
#include "drizzled/session/cache.h"
64
64
#include "drizzled/charset.h"
65
65
#include "plugin/myisam/myisam.h"
66
66
#include "drizzled/drizzled.h"
443
443
 
444
444
  {
445
445
    boost::mutex::scoped_lock scopedLock(session::Cache::singleton().mutex());
446
 
    session::Cache::List list= session::Cache::singleton().getCache();
 
446
    session::Cache::list list= session::Cache::singleton().getCache();
447
447
 
448
 
    for (session::Cache::List::iterator it= list.begin(); it != list.end(); ++it )
 
448
    for (session::Cache::list::iterator it= list.begin(); it != list.end(); ++it )
449
449
    {
450
450
      Session::shared_ptr tmp(*it);
451
451
 
468
468
  for (;;)
469
469
  {
470
470
    boost::mutex::scoped_lock scopedLock(session::Cache::singleton().mutex());
471
 
    session::Cache::List list= session::Cache::singleton().getCache();
 
471
    session::Cache::list list= session::Cache::singleton().getCache();
472
472
 
473
473
    if (list.empty())
474
474
    {
1356
1356
  {
1357
1357
    po::store(parsed, vm);
1358
1358
  }
1359
 
  catch (...)
 
1359
  catch (std::exception&)
1360
1360
  {
1361
1361
    errmsg_printf(ERRMSG_LVL_ERROR, _("Duplicate entry for command line option\n"));
1362
1362
    unireg_abort(1);