← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2009-02-07 22:02:41 UTC
  • Revision ID: brian@tangent.org-20090207220241-ez3828o1246ab2sp
Removing on typedeffed class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
68
68
  return false;
69
69
}
70
70
 
71
 
void Item::fix_after_pullout(st_select_lex *, Item **)
 
71
void Item::fix_after_pullout(Select_Lex *, Item **)
72
72
{}
73
73
 
74
74
 
982
982
 
983
983
 
984
984
/**
985
 
  Mark item and SELECT_LEXs as dependent if item was resolved in
 
985
  Mark item and Select_Lexs as dependent if item was resolved in
986
986
  outer SELECT.
987
987
 
988
988
  @param session             thread handler
993
993
                         substitution)
994
994
*/
995
995
 
996
 
void mark_as_dependent(Session *session, SELECT_LEX *last, SELECT_LEX *current,
 
996
void mark_as_dependent(Session *session, Select_Lex *last, Select_Lex *current,
997
997
                              Item_ident *resolved_item,
998
998
                              Item_ident *mark_item)
999
999
{
1001
1001
                        resolved_item->db_name : "");
1002
1002
  const char *table_name= (resolved_item->table_name ?
1003
1003
                           resolved_item->table_name : "");
1004
 
  /* store pointer on SELECT_LEX from which item is dependent */
 
1004
  /* store pointer on Select_Lex from which item is dependent */
1005
1005
  if (mark_item)
1006
1006
    mark_item->depended_from= last;
1007
1007
  current->mark_as_dependent(last);
1040
1040
*/
1041
1041
 
1042
1042
void mark_select_range_as_dependent(Session *session,
1043
 
                                    SELECT_LEX *last_select,
1044
 
                                    SELECT_LEX *current_sel,
 
1043
                                    Select_Lex *last_select,
 
1044
                                    Select_Lex *current_sel,
1045
1045
                                    Field *found_field, Item *found_item,
1046
1046
                                    Item_ident *resolved_item)
1047
1047
{
1051
1051
    done once when we resolved this field and cached result of
1052
1052
    resolving)
1053
1053
  */
1054
 
  SELECT_LEX *previous_select= current_sel;
 
1054
  Select_Lex *previous_select= current_sel;
1055
1055
  for (; previous_select->outer_select() != last_select;
1056
1056
       previous_select= previous_select->outer_select())
1057
1057
  {
1226
1226
*/
1227
1227
 
1228
1228
Item**
1229
 
resolve_ref_in_select_and_group(Session *session, Item_ident *ref, SELECT_LEX *select)
 
1229
resolve_ref_in_select_and_group(Session *session, Item_ident *ref, Select_Lex *select)
1230
1230
{
1231
1231
  Item **group_by_ref= NULL;
1232
1232
  Item **select_ref= NULL;