← 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: 2009-02-07 22:33:25 UTC
  • Revision ID: brian@tangent.org-20090207223325-5ipgldvw1pkghboq
typdef class removal (just... use the name of the class).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
276
276
    res= mysql_union(session, lex, result, &lex->unit, setup_tables_done_option);
277
277
  else
278
278
  {
279
 
    Select_Lex_UNIT *unit= &lex->unit;
 
279
    Select_Lex_Unit *unit= &lex->unit;
280
280
    unit->set_limit(unit->global_parameters);
281
281
    session->session_marker= 0;
282
282
    /*
469
469
              order_st *order_init, order_st *group_init,
470
470
              Item *having_init,
471
471
              order_st *proc_param_init, Select_Lex *select_lex_arg,
472
 
              Select_Lex_UNIT *unit_arg)
 
472
              Select_Lex_Unit *unit_arg)
473
473
{
474
474
  // to prevent double initialization on EXPLAIN
475
475
  if (optimized)
2631
2631
             TableList *tables, uint32_t wild_num, List<Item> &fields,
2632
2632
             COND *conds, uint32_t og_num,  order_st *order, order_st *group,
2633
2633
             Item *having, order_st *proc_param, uint64_t select_options,
2634
 
             select_result *result, Select_Lex_UNIT *unit,
 
2634
             select_result *result, Select_Lex_Unit *unit,
2635
2635
             Select_Lex *select_lex)
2636
2636
{
2637
2637
  bool err;
3195
3195
 
3196
3196
bool JOIN::setup_subquery_materialization()
3197
3197
{
3198
 
  for (Select_Lex_UNIT *un= select_lex->first_inner_unit(); un;
 
3198
  for (Select_Lex_Unit *un= select_lex->first_inner_unit(); un;
3199
3199
       un= un->next_unit())
3200
3200
  {
3201
3201
    for (Select_Lex *sl= un->first_select(); sl; sl= sl->next_select())
7991
7991
 
7992
7992
void JOIN::join_free()
7993
7993
{
7994
 
  Select_Lex_UNIT *tmp_unit;
 
7994
  Select_Lex_Unit *tmp_unit;
7995
7995
  Select_Lex *sl;
7996
7996
  /*
7997
7997
    Optimization: if not EXPLAIN and we are done with the JOIN,
15273
15273
 
15274
15274
void free_underlaid_joins(Session *, Select_Lex *select)
15275
15275
{
15276
 
  for (Select_Lex_UNIT *unit= select->first_inner_unit();
 
15276
  for (Select_Lex_Unit *unit= select->first_inner_unit();
15277
15277
       unit;
15278
15278
       unit= unit->next_unit())
15279
15279
    unit->cleanup();
16187
16187
        join->error= 1;
16188
16188
    }
16189
16189
  }
16190
 
  for (Select_Lex_UNIT *unit= join->select_lex->first_inner_unit();
 
16190
  for (Select_Lex_Unit *unit= join->select_lex->first_inner_unit();
16191
16191
       unit;
16192
16192
       unit= unit->next_unit())
16193
16193
  {
16198
16198
}
16199
16199
 
16200
16200
 
16201
 
bool mysql_explain_union(Session *session, Select_Lex_UNIT *unit, select_result *result)
 
16201
bool mysql_explain_union(Session *session, Select_Lex_Unit *unit, select_result *result)
16202
16202
{
16203
16203
  bool res= 0;
16204
16204
  Select_Lex *first= unit->first_select();