← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to sql/item.h

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
Tags: 5.5.36-1
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item.h
2073
2073
      tab->merge_keys.merge(field->part_of_key);
2074
2074
      if (tab->read_set)
2075
2075
        bitmap_fast_test_and_set(tab->read_set, field->field_index);
2076
 
      if (field->vcol_info)
 
2076
      /* 
 
2077
        Do not mark a self-referecing virtual column.
 
2078
        Such virtual columns are reported as invalid.
 
2079
      */
 
2080
      if (field->vcol_info && tab->vcol_set)
2077
2081
        tab->mark_virtual_col(field);
2078
2082
    }
2079
2083
  }
3402
3406
  void cleanup()
3403
3407
  {
3404
3408
    null_ref_table= NULL;
 
3409
    item_equal= NULL;
3405
3410
    Item_direct_ref::cleanup();
3406
3411
  }
3407
3412
};