~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Brian Aker
  • Date: 2011-01-16 20:38:08 UTC
  • mto: (2088.1.1 merge)
  • mto: This revision was merged to the branch mainline in revision 2089.
  • Revision ID: brian@gir-3-20110116203808-dl1dvpoarmkug1no
Entire convert over to time_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
77
77
  All global error messages are sent here where the first one is stored
78
78
  for the client.
79
79
*/
80
 
static void my_message_sql(uint32_t error, const char *str, myf MyFlags)
 
80
static void my_message_sql(drizzled::error_t error, const char *str, myf MyFlags)
81
81
{
82
82
  Session *session;
83
83
  /*
106
106
    {
107
107
      if (! session->main_da.is_error())            // Return only first message
108
108
      {
109
 
        if (error == 0)
 
109
        if (error == EE_OK)
110
110
          error= ER_UNKNOWN_ERROR;
 
111
 
111
112
        if (str == NULL)
112
113
          str= ER(error);
 
114
 
113
115
        session->main_da.set_error_status(error, str);
114
116
      }
115
117
    }