← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Brian Aker
  • Date: 2011-01-16 20:44:50 UTC
  • mfrom: (2087.3.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2089.
  • Revision ID: brian@gir-3-20110116204450-tu2jm0x96azo18xu
Update entire interface to use error_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
113
113
*/
114
114
 
115
115
DRIZZLE_ERROR *push_warning(Session *session, DRIZZLE_ERROR::enum_warning_level level,
116
 
                          uint32_t code, const char *msg)
 
116
                            drizzled::error_t code, const char *msg)
117
117
{
118
118
  DRIZZLE_ERROR *err= 0;
119
119
 
120
 
  if (level == DRIZZLE_ERROR::WARN_LEVEL_NOTE &&
121
 
      !(session->options & OPTION_SQL_NOTES))
122
 
    return(0);
 
120
  if (level == DRIZZLE_ERROR::WARN_LEVEL_NOTE && !(session->options & OPTION_SQL_NOTES))
 
121
  {
 
122
    return NULL;
 
123
  }
123
124
 
124
125
  if (session->getQueryId() != session->getWarningQueryId())
125
126
    drizzle_reset_errors(session, 0);
149
150
  {
150
151
    /* We have to use warn_root, as mem_root is freed after each query */
151
152
    if ((err= new (&session->warn_root) DRIZZLE_ERROR(session, code, level, msg)))
 
153
    {
152
154
      session->warn_list.push_back(err, &session->warn_root);
 
155
    }
153
156
  }
154
157
  session->warn_count[(uint32_t) level]++;
155
158
  session->total_warn_count++;
156
 
  return(err);
 
159
 
 
160
  return err;
157
161
}
158
162
 
159
163
/*
168
172
*/
169
173
 
170
174
void push_warning_printf(Session *session, DRIZZLE_ERROR::enum_warning_level level,
171
 
                         uint32_t code, const char *format, ...)
 
175
                         drizzled::error_t code, const char *format, ...)
172
176
{
173
177
  va_list args;
174
178
  char    warning[ERRMSGSIZE+20];
177
181
  vsnprintf(warning, sizeof(warning), format, args);
178
182
  va_end(args);
179
183
  push_warning(session, level, code, warning);
180
 
  return;
181
184
}
182
185
 
183
186