← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
826
826
              /* The column to which we link isn't valid. */
827
827
              my_error(ER_BAD_FIELD_ERROR, MYF(0), (*res)->name,
828
828
                       session->where());
829
 
              return(1);
 
829
              return 1;
830
830
            }
831
831
 
832
832
            set_field(new_field);