← Back to branch summary

~clint-fewbar/ubuntu/natty/drizzle/beta1-fixes

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-15 10:41:18 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110315104118-eaf0hvlytjdl4zrf
Tags: 2011.03.13-0ubuntu1
* New upstream release.
* Added slave plugin.
* Removed archive, blackhole and blitzdb plugins.
* Moved location of libdrizzle headers.
* Removed drizzleadmin manpage patch.
* Add drizzle_safe_write_string to symbols.

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