← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
81
81
 
82
82
void drizzle_reset_errors(Session *session, bool force)
83
83
{
84
 
  if (session->query_id != session->warn_id || force)
 
84
  if (session->getQueryId() != session->getWarningQueryId() || force)
85
85
  {
86
 
    session->warn_id= session->query_id;
 
86
    session->setWarningQueryId(session->getQueryId());
87
87
    free_root(&session->warn_root,MYF(0));
88
88
    memset(session->warn_count, 0, sizeof(session->warn_count));
89
89
    if (force)
118
118
      !(session->options & OPTION_SQL_NOTES))
119
119
    return(0);
120
120
 
121
 
  if (session->query_id != session->warn_id)
 
121
  if (session->getQueryId() != session->getWarningQueryId())
122
122
    drizzle_reset_errors(session, 0);
123
123
  session->got_warning= 1;
124
124