← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Monty Taylor
  • Date: 2008-09-05 22:55:50 UTC
  • mfrom: (373.1.9 stl-client-progs)
  • Revision ID: monty@inaugust.com-20080905225550-zco374c9s7kxwqyb
Merged removal of DYNAMIC_STRING.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
20
20
}
21
21
 
22
22
 
23
 
Item *Field_iterator_table::create_item(Session *session)
 
23
Item *Field_iterator_table::create_item(THD *thd)
24
24
{
25
 
  SELECT_LEX *select= session->lex->current_select;
 
25
  SELECT_LEX *select= thd->lex->current_select;
26
26
 
27
 
  Item_field *item= new Item_field(session, &select->context, *ptr);
 
27
  Item_field *item= new Item_field(thd, &select->context, *ptr);
28
28
 
29
29
#ifdef DEAD_CODE
30
30
 
31
 
  if (item && session->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY &&
32
 
      !session->lex->in_sum_func && select->cur_pos_in_select_list != UNDEF_POS)
 
31
  if (item && thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY &&
 
32
      !thd->lex->in_sum_func && select->cur_pos_in_select_list != UNDEF_POS)
33
33
  {
34
34
    select->non_agg_fields.push_back(item);
35
35
    item->marker= select->cur_pos_in_select_list;
187
187
{
188
188
  Natural_join_column *nj_col;
189
189
  bool is_created= true;
190
 
  uint32_t field_count=0;
 
190
  uint field_count=0;
191
191
  TableList *add_table_ref= parent_table_ref ?
192
192
                             parent_table_ref : table_ref;
193
193