← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: patrick crews
  • Date: 2010-10-07 19:35:15 UTC
  • mto: (1819.2.4 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1825.
  • Revision ID: gleebix@gmail.com-20101007193515-jr6y1uz710lzte1o
Initial work on lp bug#656423 - remove use of 'mysql' from test-run tool.  Removed / substituted mtr->dtr mysql->drizzle.  Removed perl errors, but server won't start due to boost error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/rem/rem0cmp.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1994, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
184
184
 
185
185
        case DATA_DECIMAL:
186
186
                /* Remove preceding spaces */
187
 
                for (; a_length && *a == ' '; a++, a_length--) {}
188
 
                for (; b_length && *b == ' '; b++, b_length--) {}
 
187
                for (; a_length && *a == ' '; a++, a_length--);
 
188
                for (; b_length && *b == ' '; b++, b_length--);
189
189
 
190
190
                if (*a == '-') {
191
191
                        if (*b != '-') {
527
527
                        != DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL)) {
528
528
 
529
529
                        ret = cmp_whole_field(mtype, prtype,
530
 
                                              static_cast<const unsigned char *>(dfield_get_data(dtuple_field)),
 
530
                                              dfield_get_data(dtuple_field),
531
531
                                              (unsigned) dtuple_f_len,
532
532
                                              rec_b_ptr, (unsigned) rec_f_len);
533
533
 
705
705
        const rec_t*            rec2,   /*!< in: physical record */
706
706
        const ulint*            offsets1,/*!< in: rec_get_offsets(rec1, ...) */
707
707
        const ulint*            offsets2,/*!< in: rec_get_offsets(rec2, ...) */
708
 
        const dict_index_t*     index,  /*!< in: data dictionary index */
709
 
        ibool*                  null_eq)/*!< out: set to TRUE if
710
 
                                        found matching null values */
 
708
        const dict_index_t*     index)  /*!< in: data dictionary index */
711
709
{
712
710
        ulint           rec1_f_len;     /*!< length of current field in rec1 */
713
711
        const byte*     rec1_b_ptr;     /*!< pointer to the current byte
754
752
                    || rec2_f_len == UNIV_SQL_NULL) {
755
753
 
756
754
                        if (rec1_f_len == rec2_f_len) {
757
 
                                if (null_eq) {
758
 
                                        *null_eq = TRUE;
759
 
                                }
760
755
 
761
756
                                goto next_field;
762
757