← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-29 13:09:10 UTC
  • mto: This revision was merged to the branch mainline in revision 2362.
  • Revision ID: olafvdspek@gmail.com-20110629130910-5dj61b6rfcv0ssv7
Use std::list for Diagnostics_area::m_warn_list

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
147
147
  {
148
148
    /* We have to use warn_root, as mem_root is freed after each query */
149
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);
 
150
    session->main_da().m_warn_list.push_back(err);
151
151
  }
152
 
  session->warn_count[(uint32_t) level]++;
 
152
  session->warn_count[level]++;
153
153
  session->total_warn_count++;
154
154
 
155
155
  return err;
220
220
 
221
221
  unit->set_limit(sel);
222
222
 
223
 
  List<DRIZZLE_ERROR>::iterator it(session->main_da().m_warn_list.begin());
224
 
  while (DRIZZLE_ERROR* err= it++)
 
223
  BOOST_FOREACH(DRIZZLE_ERROR* err, session->main_da().m_warn_list)
225
224
  {
226
225
    /* Skip levels that the user is not interested in */
227
226
    if (! levels_to_show.test(err->level))