← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 19:11:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704191147-s99ojek811zi1fzj
Remove unused Name_resolution_context::error_reporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
851
851
        }
852
852
      }
853
853
      if ((ret= fix_outer_field(session, &from_field, reference)) < 0)
854
 
        goto error;
 
854
        return true;
855
855
      outer_fixed= true;
856
856
      if (!ret)
857
857
        goto mark_non_agg_field;
858
858
    }
859
859
    else if (!from_field)
860
 
      goto error;
 
860
      return true;
861
861
 
862
862
    if (!outer_fixed && cached_table && cached_table->select_lex &&
863
863
        context->select_lex &&
865
865
    {
866
866
      int ret;
867
867
      if ((ret= fix_outer_field(session, &from_field, reference)) < 0)
868
 
        goto error;
 
868
        return true;
869
869
      outer_fixed= 1;
870
870
      if (!ret)
871
871
        goto mark_non_agg_field;
923
923
  fixed= 1;
924
924
mark_non_agg_field:
925
925
  return false;
926
 
 
927
 
error:
928
 
  context->process_error(session);
929
 
  return true;
930
926
}
931
927
 
932
928
Item *Item_field::safe_charset_converter(const charset_info_st * const tocs)