← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Lee Bieber
  • Date: 2011-01-28 02:32:26 UTC
  • mfrom: (2114.4.10 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2124.
  • Revision ID: kalebral@gmail.com-20110128023226-11i88kemmdygtz0d
Merge Brian - more parser rework

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
961
961
          best match, they must reference the same column, otherwise the field
962
962
          is ambiguous.
963
963
        */
964
 
        my_error(ER_NON_UNIQ_ERROR, MYF(0), find_item->full_name(), current_session->where);
 
964
        my_error(ER_NON_UNIQ_ERROR, MYF(0), find_item->full_name(), current_session->where());
965
965
        return NULL;
966
966
      }
967
967
    }
1006
1006
      ambiguous_fields= true;
1007
1007
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_NON_UNIQ_ERROR,
1008
1008
                          ER(ER_NON_UNIQ_ERROR), ref->full_name(),
1009
 
                          current_session->where);
 
1009
                          session->where());
1010
1010
 
1011
1011
    }
1012
1012
  }