← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2008-07-05 22:08:52 UTC
  • mto: This revision was merged to the branch mainline in revision 77.
  • Revision ID: monty@inaugust.com-20080705220852-cqd9t6tfkhvlcf73
Removed HAVE_LONG_LONG, as this is now assumed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/rem/rem0cmp.c
260
260
        case DATA_VARMYSQL:
261
261
        case DATA_MYSQL:
262
262
                return(innobase_mysql_cmp(
263
 
                               (int)(prtype & DATA_DRIZZLE_TYPE_MASK),
 
263
                               (int)(prtype & DATA_MYSQL_TYPE_MASK),
264
264
                               (uint)dtype_get_charset_coll(prtype),
265
265
                               a, a_length, b, b_length));
266
266
        default:
318
318
            || (mtype == DATA_BLOB
319
319
                && 0 == (prtype & DATA_BINARY_TYPE)
320
320
                && dtype_get_charset_coll(prtype)
321
 
                != DATA_DRIZZLE_LATIN1_SWEDISH_CHARSET_COLL)) {
 
321
                != DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL)) {
322
322
 
323
323
                return(cmp_whole_field(mtype, prtype,
324
324
                                       data1, (unsigned) len1,
527
527
                    || (mtype == DATA_BLOB
528
528
                        && 0 == (prtype & DATA_BINARY_TYPE)
529
529
                        && dtype_get_charset_coll(prtype)
530
 
                        != DATA_DRIZZLE_LATIN1_SWEDISH_CHARSET_COLL)) {
 
530
                        != DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL)) {
531
531
 
532
532
                        ret = cmp_whole_field(mtype, prtype,
533
533
                                              dfield_get_data(dtuple_field),
843
843
                    || (mtype == DATA_BLOB
844
844
                        && 0 == (prtype & DATA_BINARY_TYPE)
845
845
                        && dtype_get_charset_coll(prtype)
846
 
                        != DATA_DRIZZLE_LATIN1_SWEDISH_CHARSET_COLL)) {
 
846
                        != DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL)) {
847
847
 
848
848
                        ret = cmp_whole_field(mtype, prtype,
849
849
                                              rec1_b_ptr,