← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Brian Aker
  • Date: 2009-08-11 03:03:58 UTC
  • mfrom: (1113.1.2 merge)
  • Revision ID: brian@gaz-20090811030358-dn0mzaj7n94zrheg
lcov dead code removal (merge)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
515
515
                                            last_name_resolution_table,
516
516
                                          reference,
517
517
                                          IGNORE_EXCEPT_NON_UNIQUE,
518
 
                                          true, true)) !=
 
518
                                          true)) !=
519
519
        not_found_field)
520
520
    {
521
521
      if (*from_field)
630
630
      find_field_in_tables(session, this,
631
631
                           context->first_name_resolution_table,
632
632
                           context->last_name_resolution_table,
633
 
                           reference, REPORT_ALL_ERRORS,
634
 
                           !any_privileges &&
635
 
                           true, true);
 
633
                           reference, REPORT_ALL_ERRORS, true);
636
634
    }
637
635
    return -1;
638
636
  }
774
772
                                          reference,
775
773
                                          session->lex->use_only_table_context ?
776
774
                                            REPORT_ALL_ERRORS :
777
 
                                            IGNORE_EXCEPT_NON_UNIQUE,
778
 
                                          !any_privileges,
779
 
                                          true)) ==
780
 
        not_found_field)
 
775
                                            IGNORE_EXCEPT_NON_UNIQUE, true)) ==
 
776
        not_found_field)
781
777
    {
782
778
      int ret;
783
779
      /* Look up in current select's item_list to find aliased fields */