← 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-03-13 16:37:38 UTC
  • mfrom: (2227.4.18 session2)
  • Revision ID: kalebral@gmail.com-20110313163738-7ti21zk40o2xi3ew
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
68
68
#include <drizzled/util/backtrace.h>
69
69
#include <drizzled/current_session.h>
70
70
#include <drizzled/daemon.h>
 
71
#include <drizzled/sql_base.h>
71
72
 
72
73
using namespace drizzled;
73
74
using namespace std;
102
103
      return;
103
104
 
104
105
    /*
105
 
      session->getLex()->current_select == 0 if lex structure is not inited
 
106
      session->lex().current_select == 0 if lex structure is not inited
106
107
      (not query command (COM_QUERY))
107
108
    */
108
 
    if (! (session->getLex()->current_select &&
109
 
           session->getLex()->current_select->no_error && !session->is_fatal_error))
 
109
    if (! (session->lex().current_select &&
 
110
           session->lex().current_select->no_error && !session->is_fatal_error))
110
111
    {
111
112
      if (! session->main_da.is_error())            // Return only first message
112
113
      {
143
144
  sigset_t set;
144
145
  struct sigaction sa;
145
146
 
146
 
  if (not (getDebug().test(debug::NO_STACKTRACE) || 
 
147
  if (not (getDebug().test(debug::NO_STACKTRACE) ||
147
148
        getDebug().test(debug::CORE_ON_SIGNAL)))
148
149
  {
149
150
    sa.sa_flags = SA_RESETHAND | SA_NODEFER;
383
384
  if (opt_daemon)
384
385
    daemon_is_ready();
385
386
 
386
 
  /* 
 
387
  /*
387
388
    Listen for new connections and start new session for each connection
388
389
     accepted. The listen.getClient() method will return NULL when the server
389
390
     should be shutdown.