← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-11 17:20:14 UTC
  • mfrom: (1838 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101011172014-sij1m2doi2fl2duo
Merge from trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
48
48
#include "drizzled/plugin/authorization.h"
49
49
#include "drizzled/optimizer/explain_plan.h"
50
50
#include "drizzled/pthread_globals.h"
 
51
#include "drizzled/plugin/event_observer.h"
51
52
 
52
53
#include <limits.h>
53
54
 
190
191
  /* TODO: set session->lex->sql_command to SQLCOM_END here */
191
192
 
192
193
  plugin::Logging::preDo(session);
 
194
  if (unlikely(plugin::EventObserver::beforeStatement(*session)))
 
195
  {
 
196
    // We should do something about an error...
 
197
  }
193
198
 
194
199
  session->server_status&=
195
200
           ~(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED);
307
312
  session->close_thread_tables();
308
313
 
309
314
  plugin::Logging::postDo(session);
 
315
  if (unlikely(plugin::EventObserver::afterStatement(*session)))
 
316
  {
 
317
    // We should do something about an error...
 
318
  }
310
319
 
311
320
  /* Store temp state for processlist */
312
321
  session->set_proc_info("cleaning up");