← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
387
387
        //here is EXPLAIN of subselect or derived table
388
388
        if (join->change_result(result))
389
389
        {
390
 
          return(true);
 
390
          return true;
391
391
        }
392
392
      }
393
393
      else
405
405
  else
406
406
  {
407
407
    if (!(join= new Join(session, fields, select_options, result)))
408
 
      return(true);
 
408
      return true;
409
409
    session->set_proc_info("init");
410
410
    session->used_tables=0;                         // Updated by setup_fields
411
411
    if ((err= join->prepare(rref_pointer_array, tables, wild_num,
1032
1032
                           maybe_null ?  key_buff : 0,
1033
1033
                           keyinfo->key_part[i].length, keyuse->getVal());
1034
1034
        if (session->is_fatal_error)
1035
 
          return(true);
 
1035
          return true;
1036
1036
        tmp.copy();
1037
1037
      }
1038
1038
      else
5936
5936
        else
5937
5937
          item_field= (Item*) new Item_field(field);
5938
5938
        if (!item_field)
5939
 
          return(true);                    // Fatal error
 
5939
          return true;                    // Fatal error
5940
5940
 
5941
5941
        if (item->real_item()->type() != Item::FIELD_ITEM)
5942
5942
          field->orig_table= 0;
5961
5961
  for (i= 0; i < border; i++)
5962
5962
    itr++;
5963
5963
  itr.sublist(res_selected_fields, elements);
5964
 
  return(false);
 
5964
  return false;
5965
5965
}
5966
5966
 
5967
5967
/**
6029
6029
  while ((func= *(func_ptr++)))
6030
6030
  {
6031
6031
    if (func->setup(session))
6032
 
      return(true);
 
6032
      return true;
6033
6033
  }
6034
 
  return(false);
 
6034
  return false;
6035
6035
}
6036
6036
 
6037
6037
void init_tmptable_sum_functions(Item_sum **func_ptr)