← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Andrew Hutchings
  • Date: 2011-01-16 11:16:55 UTC
  • mto: (2094.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2095.
  • Revision ID: andrew@linuxjedi.co.uk-20110116111655-pojboeq1ooczkgd0
https://launchpad.net/bugs/680872
Remove max-connect-error variables since it is completely unused

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