← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Andrew Hutchings
  • Date: 2010-12-06 19:36:53 UTC
  • mfrom: (1976 staging)
  • mto: This revision was merged to the branch mainline in revision 1991.
  • Revision ID: andrew@linuxjedi.co.uk-20101206193653-l85vryv18jb0yxx8
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
39
39
#include <drizzled/statement.h>
40
40
#include <drizzled/statement/alter_table.h>
41
41
#include "drizzled/probes.h"
42
 
#include "drizzled/session_list.h"
 
42
#include "drizzled/session/cache.h"
43
43
#include "drizzled/global_charset_info.h"
44
44
 
45
45
#include "drizzled/plugin/logging.h"
224
224
                        session->thread_id,
225
225
                        const_cast<const char *>(session->db.empty() ? "" : session->db.c_str()));
226
226
 
227
 
    plugin::QueryRewriter::rewriteQuery(session->getSchema(), session->getQueryString());
228
227
    mysql_parse(session, session->getQueryString()->c_str(), session->getQueryString()->length());
229
228
 
230
229
    break;
755
754
        {
756
755
          // Just try to catch any random failures that could have come
757
756
          // during execution.
 
757
          unireg_abort(1);
758
758
        }
759
759
        DRIZZLE_QUERY_EXEC_DONE(0);
760
760
      }