← 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-16 16:39:32 UTC
  • mfrom: (2239.1.11 includes)
  • mto: This revision was merged to the branch mainline in revision 2240.
  • Revision ID: kalebral@gmail.com-20110316163932-ckt3uulj4pimqs8b
Merge Olaf - refactor includes

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/diagnostics_area.h>
71
72
#include <drizzled/sql_base.h>
72
73
#include <drizzled/sql_lex.h>
73
74
 
110
111
    if (! (session->lex().current_select &&
111
112
           session->lex().current_select->no_error && !session->is_fatal_error))
112
113
    {
113
 
      if (! session->main_da.is_error())            // Return only first message
 
114
      if (! session->main_da().is_error())            // Return only first message
114
115
      {
115
116
        if (error == EE_OK)
116
117
          error= ER_UNKNOWN_ERROR;
118
119
        if (str == NULL)
119
120
          str= ER(error);
120
121
 
121
 
        session->main_da.set_error_status(error, str);
 
122
        session->main_da().set_error_status(error, str);
122
123
      }
123
124
    }
124
125