← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
146
146
  if (session->main_da().m_warn_list.size() < session->variables.max_error_count)
147
147
  {
148
148
    /* We have to use warn_root, as mem_root is freed after each query */
149
 
    err= new (&session->warn_root) DRIZZLE_ERROR(session, code, level, msg);
150
 
    session->main_da().m_warn_list.push_back(err, &session->warn_root);
 
149
    err= new (session->warn_root) DRIZZLE_ERROR(session, code, level, msg);
 
150
    session->main_da().m_warn_list.push_back(err, session->warn_root);
151
151
  }
152
152
  session->warn_count[(uint32_t) level]++;
153
153
  session->total_warn_count++;