← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2010-03-11 18:27:20 UTC
  • mfrom: (1333 staging)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: mordred@inaugust.com-20100311182720-hd1h87y6cb1b1mp0
Merged trunk.

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"
42
41
#include "drizzled/item/cache.h"
43
42
#include "drizzled/item/cmpfunc.h"
44
43
#include "drizzled/item/copy_string.h"
116
115
{
117
116
  bool res;
118
117
  register Select_Lex *select_lex= &lex->select_lex;
119
 
  DRIZZLE_SELECT_START(session->query);
 
118
  DRIZZLE_SELECT_START(session->query.c_str());
120
119
 
121
120
  if (select_lex->master_unit()->is_union() ||
122
121
      select_lex->master_unit()->fake_select_lex)
347
346
*/
348
347
bool mysql_select(Session *session,
349
348
                  Item ***rref_pointer_array,
350
 
                        TableList *tables, 
 
349
                  TableList *tables, 
351
350
                  uint32_t wild_num, 
352
351
                  List<Item> &fields,
353
 
                        COND *conds, 
 
352
                  COND *conds, 
354
353
                  uint32_t og_num,  
355
354
                  order_st *order, 
356
355
                  order_st *group,
357
 
                        Item *having, 
 
356
                  Item *having, 
358
357
                  uint64_t select_options,
359
 
                        select_result *result, 
 
358
                  select_result *result, 
360
359
                  Select_Lex_Unit *unit,
361
 
                        Select_Lex *select_lex)
 
360
                  Select_Lex *select_lex)
362
361
{
363
362
  bool err;
364
363
  bool free_join= 1;