← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
41
41
 
42
42
***********************************************************************/
43
43
 
44
 
#include <config.h>
 
44
#include "config.h"
45
45
 
46
46
#include <cstdio>
47
47
#include <stdarg.h>
91
91
    memset(session->warn_count, 0, sizeof(session->warn_count));
92
92
    if (force)
93
93
      session->total_warn_count= 0;
94
 
    session->warn_list.clear();
 
94
    session->warn_list.empty();
95
95
    session->row_count= 1; // by default point to row 1
96
96
  }
97
97
  return;
128
128
 
129
129
  /* Abort if we are using strict mode and we are not using IGNORE */
130
130
  if ((int) level >= (int) DRIZZLE_ERROR::WARN_LEVEL_WARN &&
131
 
      session->abortOnWarning())
 
131
      session->really_abort_on_warning())
132
132
  {
133
133
    /* Avoid my_message() calling push_warning */
134
134
    bool no_warnings_for_error= session->no_warnings_for_error;
221
221
    return true;
222
222
 
223
223
  DRIZZLE_ERROR *err;
224
 
  Select_Lex *sel= &session->getLex()->select_lex;
225
 
  Select_Lex_Unit *unit= &session->getLex()->unit;
 
224
  Select_Lex *sel= &session->lex->select_lex;
 
225
  Select_Lex_Unit *unit= &session->lex->unit;
226
226
  ha_rows idx= 0;
227
227
 
228
228
  unit->set_limit(sel);
229
229
 
230
 
  List<DRIZZLE_ERROR>::iterator it(session->warn_list.begin());
 
230
  List_iterator_fast<DRIZZLE_ERROR> it(session->warn_list);
231
231
  while ((err= it++))
232
232
  {
233
233
    /* Skip levels that the user is not interested in */