← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Lee Bieber
  • Date: 2011-01-28 03:45:59 UTC
  • mfrom: (2123.1.2 build)
  • Revision ID: kalebral@gmail.com-20110128034559-cxgcjzghp6kpnhuv
Merge Brian - more parser rework
Merge Patrick - 708899: dbqp.py needs --reorder option 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
640
640
    if (upward_lookup)
641
641
    {
642
642
      // We can't say exactly what absent table or field
643
 
      my_error(ER_BAD_FIELD_ERROR, MYF(0), full_name(), session->where);
 
643
      my_error(ER_BAD_FIELD_ERROR, MYF(0), full_name(), session->where());
644
644
    }
645
645
    else
646
646
    {
824
824
            {
825
825
              /* The column to which we link isn't valid. */
826
826
              my_error(ER_BAD_FIELD_ERROR, MYF(0), (*res)->name,
827
 
                       current_session->where);
 
827
                       session->where());
828
828
              return(1);
829
829
            }
830
830