~maria-captains/maria/maria-5.3-mwl247

« back to all changes in this revision

Viewing changes to sql/sql_select.cc

  • Committer: Igor Babaev
  • Date: 2012-03-02 00:02:25 UTC
  • mfrom: (3393.1.58 maria-5.3-bug943543)
  • Revision ID: igor@askmonty.org-20120302000225-o5wm631f7k4zai30
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
3783
3783
          if (old->field->maybe_null())
3784
3784
          {
3785
3785
            old->optimize= KEY_OPTIMIZE_REF_OR_NULL;
3786
 
            /*
3787
 
              Remember the NOT NULL value unless the value does not depend
3788
 
              on other tables.
3789
 
            */
3790
 
            if (!old->val->used_tables() && old->val->is_null())
3791
 
              old->val= new_fields->val;
3792
3786
            /* The referred expression can be NULL: */ 
3793
3787
            old->null_rejecting= 0;
3794
3788
          }
 
3789
          /*
 
3790
            Remember the NOT NULL value unless the value does not depend
 
3791
            on other tables.
 
3792
          */
 
3793
          if (!old->val->used_tables() && old->val->is_null())
 
3794
            old->val= new_fields->val;
3795
3795
        }
3796
3796
        else
3797
3797
        {