← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.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/item/subselect.cc
688
688
}
689
689
 
690
690
 
691
 
bool Item_in_subselect::test_limit(Select_Lex_unit *unit_arg)
 
691
bool Item_in_subselect::test_limit(Select_Lex_Unit *unit_arg)
692
692
{
693
693
  if (unit_arg->fake_select_lex &&
694
694
      unit_arg->fake_select_lex->test_limit())
1050
1050
  if (!substitution)
1051
1051
  {
1052
1052
    /* We're invoked for the 1st (or the only) SELECT in the subquery UNION */
1053
 
    Select_Lex_UNIT *master_unit= select_lex->master_unit();
 
1053
    Select_Lex_Unit *master_unit= select_lex->master_unit();
1054
1054
    substitution= optimizer;
1055
1055
 
1056
1056
    Select_Lex *current= session->lex->current_select, *up;
1326
1326
  if (!substitution)
1327
1327
  {
1328
1328
    //first call for this unit
1329
 
    Select_Lex_UNIT *master_unit= select_lex->master_unit();
 
1329
    Select_Lex_Unit *master_unit= select_lex->master_unit();
1330
1330
    substitution= optimizer;
1331
1331
 
1332
1332
    Select_Lex *current= session->lex->current_select, *up;
1966
1966
}
1967
1967
 
1968
1968
 
1969
 
subselect_union_engine::subselect_union_engine(Select_Lex_unit *u,
 
1969
subselect_union_engine::subselect_union_engine(Select_Lex_Unit *u,
1970
1970
                                               select_result_interceptor *result_arg,
1971
1971
                                               Item_subselect *item_arg)
1972
1972
  :subselect_engine(item_arg, result_arg)
2132
2132
  session->lex->current_select= select_lex;
2133
2133
  if (!join->optimized)
2134
2134
  {
2135
 
    Select_Lex_UNIT *unit= select_lex->master_unit();
 
2135
    Select_Lex_Unit *unit= select_lex->master_unit();
2136
2136
 
2137
2137
    unit->set_limit(unit->global_parameters);
2138
2138
    if (join->flatten_subqueries())