← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to storage/innobase/rem/rem0cmp.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mto: (1.2.1) (37.1.1 lucid-security)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: package-import@ubuntu.com-20120222223355-ku1tb4r70osci6v2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/rem/rem0cmp.c
720
720
        const ulint*    offsets1,/* in: rec_get_offsets(rec1, index) */
721
721
        const ulint*    offsets2,/* in: rec_get_offsets(rec2, index) */
722
722
        dict_index_t*   index,  /* in: data dictionary index */
 
723
        ibool           nulls_unequal,
 
724
                                /* in: TRUE if this is for index statistics
 
725
                                cardinality estimation, and innodb_stats_method
 
726
                                is "nulls_unequal" or "nulls_ignored" */
723
727
        ulint*          matched_fields, /* in/out: number of already completely
724
728
                                matched fields; when the function returns,
725
729
                                contains the value the for current
821
825
                            || rec2_f_len == UNIV_SQL_NULL) {
822
826
 
823
827
                                if (rec1_f_len == rec2_f_len) {
824
 
 
825
 
                                        goto next_field;
826
 
 
 
828
                                        /* This is limited to stats collection,
 
829
                                        cannot use it for regular search */
 
830
                                        if (nulls_unequal) {
 
831
                                                ret = -1;
 
832
                                        } else {
 
833
                                                goto next_field;
 
834
                                        }
827
835
                                } else if (rec2_f_len == UNIV_SQL_NULL) {
828
836
 
829
837
                                        /* We define the SQL null to be the