← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/rem/rem0cmp.cc

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-10-29 15:43:40 UTC
  • mfrom: (1.2.12) (2.1.19 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131029154340-2gp39el6cv8bwf2o
Tags: 1:7.2.3-2ubuntu1
* Merge from debian, remaining changes:
  - Link against boost_system because of boost_thread.
  - Add required libs to message/include.am
  - Add upstart job and adjust init script to be upstart compatible.
  - Disable -floop-parallelize-all due to gcc-4.8/4.9 compiler ICE
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57732

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/rem/rem0cmp.cc
861
861
        const ulint*    offsets1,/*!< in: rec_get_offsets(rec1, index) */
862
862
        const ulint*    offsets2,/*!< in: rec_get_offsets(rec2, index) */
863
863
        dict_index_t*   index,  /*!< in: data dictionary index */
 
864
        ibool           nulls_unequal,
 
865
                                /* in: TRUE if this is for index statistics
 
866
                                cardinality estimation, and innodb_stats_method
 
867
                                is "nulls_unequal" or "nulls_ignored" */
864
868
        ulint*          matched_fields, /*!< in/out: number of already completely
865
869
                                matched fields; when the function returns,
866
870
                                contains the value the for current
960
964
                            || rec2_f_len == UNIV_SQL_NULL) {
961
965
 
962
966
                                if (rec1_f_len == rec2_f_len) {
963
 
 
964
 
                                        goto next_field;
965
 
 
 
967
                                        /* This is limited to stats collection,
 
968
                                        cannot use it for regular search */
 
969
                                        if (nulls_unequal) {
 
970
                                                ret = -1;
 
971
                                        } else {
 
972
                                                goto next_field;
 
973
                                        }
966
974
                                } else if (rec2_f_len == UNIV_SQL_NULL) {
967
975
 
968
976
                                        /* We define the SQL null to be the