← Back to branch summary

~skinny.moey/drizzle/server_uuid_repl

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2011-04-21 21:09:08 UTC
  • mfrom: (2281.4.3 prune)
  • Revision ID: brian@tangent.org-20110421210908-qfoyfsfmqn6b1ocd
Merge in Olaf prune tree (with comment on set_db)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
88
88
*/
89
89
static void my_message_sql(drizzled::error_t error, const char *str, myf MyFlags)
90
90
{
91
 
  Session *session;
 
91
  Session* session= current_session;
92
92
  /*
93
93
    Put here following assertion when situation with EE_* error codes
94
94
    will be fixed
95
95
  */
96
 
  if ((session= current_session))
 
96
  if (session)
97
97
  {
98
98
    if (MyFlags & ME_FATALERROR)
99
99
      session->is_fatal_error= 1;
101
101
    /*
102
102
      @TODO There are two exceptions mechanism (Session and sp_rcontext),
103
103
      this could be improved by having a common stack of handlers.
104
 
    */
 
104
 
105
105
    if (session->handle_error(error, str, DRIZZLE_ERROR::WARN_LEVEL_ERROR))
106
106
      return;
 
107
    */
107
108
 
108
109
    /*
109
110
      session->lex().current_select == 0 if lex structure is not inited