← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
93
93
      session->is_fatal_error= 1;
94
94
 
95
95
    /*
96
 
      TODO: There are two exceptions mechanism (Session and sp_rcontext),
 
96
      @TODO There are two exceptions mechanism (Session and sp_rcontext),
97
97
      this could be improved by having a common stack of handlers.
98
98
    */
99
 
    if (session->handle_error(error, str,
100
 
                          DRIZZLE_ERROR::WARN_LEVEL_ERROR))
101
 
      return;;
 
99
    if (session->handle_error(error, str, DRIZZLE_ERROR::WARN_LEVEL_ERROR))
 
100
      return;
102
101
 
103
102
    /*
104
103
      session->lex->current_select == 0 if lex structure is not inited
105
104
      (not query command (COM_QUERY))
106
105
    */
107
106
    if (! (session->lex->current_select &&
108
 
        session->lex->current_select->no_error && !session->is_fatal_error))
 
107
           session->lex->current_select->no_error && !session->is_fatal_error))
109
108
    {
110
109
      if (! session->main_da.is_error())            // Return only first message
111
110
      {
128
127
      session->no_warnings_for_error= true;
129
128
      push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_ERROR, error, str);
130
129
      session->no_warnings_for_error= false;
131
 
      }
132
130
    }
 
131
  }
133
132
 
134
 
    if (not session || MyFlags & ME_NOREFRESH)
135
 
    {
136
 
      errmsg_printf(error::ERROR, "%s: %s",internal::my_progname,str);
137
 
    }
 
133
  if (not session || MyFlags & ME_NOREFRESH)
 
134
  {
 
135
    errmsg_printf(error::ERROR, "%s: %s",internal::my_progname,str);
 
136
  }
138
137
}
139
138
 
140
139
static void init_signals(void)
282
281
      unireg_abort(1);
283
282
    }
284
283
 
 
284
    fs::path &full_data_home= getFullDataHome();
285
285
    full_data_home= fs::system_complete(getDataHome());
 
286
    std::cerr << "home " << full_data_home << std::endl;
286
287
  }
287
288
 
288
289