← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2010-02-19 23:42:02 UTC
  • mto: (1273.19.18 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1309.
  • Revision ID: brian@gir.tangent.org-20100219234202-boogaw8j3folts51
Basic engine with test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
38
38
#include "drizzled/nested_join.h"
39
39
#include "drizzled/probes.h"
40
40
#include "drizzled/show.h"
 
41
#include "drizzled/plugin/info_schema_table.h"
41
42
#include "drizzled/item/cache.h"
42
43
#include "drizzled/item/cmpfunc.h"
43
44
#include "drizzled/item/copy_string.h"
115
116
{
116
117
  bool res;
117
118
  register Select_Lex *select_lex= &lex->select_lex;
118
 
  DRIZZLE_SELECT_START(session->query.c_str());
 
119
  DRIZZLE_SELECT_START(session->query);
119
120
 
120
121
  if (select_lex->master_unit()->is_union() ||
121
122
      select_lex->master_unit()->fake_select_lex)