← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
146
146
  if (session->handle_error(code, msg, level))
147
147
    return NULL;
148
148
 
149
 
  if (session->warn_list.elements < session->variables.max_error_count)
 
149
  if (session->warn_list.size() < session->variables.max_error_count)
150
150
  {
151
151
    /* We have to use warn_root, as mem_root is freed after each query */
152
152
    if ((err= new (&session->warn_root) DRIZZLE_ERROR(session, code, level, msg)))