← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

Merge Stewart's dead code removal

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"
45
 
 
46
 
#include <stdarg.h>
47
 
 
 
44
#include <drizzled/server_includes.h>
48
45
#include <drizzled/session.h>
49
46
#include <drizzled/sql_base.h>
50
47
#include <drizzled/item/empty_string.h>
52
49
#include <drizzled/plugin/client.h>
53
50
 
54
51
using namespace std;
55
 
 
56
 
namespace drizzled
57
 
{
 
52
using namespace drizzled;
58
53
 
59
54
/*
60
55
  Store a new message in an error object
83
78
 
84
79
void drizzle_reset_errors(Session *session, bool force)
85
80
{
86
 
  if (session->getQueryId() != session->getWarningQueryId() || force)
 
81
  if (session->query_id != session->warn_id || force)
87
82
  {
88
 
    session->setWarningQueryId(session->getQueryId());
 
83
    session->warn_id= session->query_id;
89
84
    free_root(&session->warn_root,MYF(0));
90
85
    memset(session->warn_count, 0, sizeof(session->warn_count));
91
86
    if (force)
120
115
      !(session->options & OPTION_SQL_NOTES))
121
116
    return(0);
122
117
 
123
 
  if (session->getQueryId() != session->getWarningQueryId())
 
118
  if (session->query_id != session->warn_id)
124
119
    drizzle_reset_errors(session, 0);
125
120
  session->got_warning= 1;
126
121
 
243
238
  session->my_eof();
244
239
  return(false);
245
240
}
246
 
 
247
 
} /* namespace drizzled */