databases/mysql56-client/patches/patch-sql_field.h

   1 $NetBSD$
   2
   3 --- sql/field.h.orig    2013-05-05 20:53:17.000000000 +0000
   4 +++ sql/field.h
   5 @@ -887,10 +887,10 @@ public:
   6    }
   7
   8    bool is_real_null(my_ptrdiff_t row_offset= 0) const
   9 -  { return real_maybe_null() ? test(null_ptr[row_offset] & null_bit) : false; }
  10 +  { return real_maybe_null() ? my_test(null_ptr[row_offset] & null_bit) : false; }
  11
  12    bool is_null_in_record(const uchar *record) const
  13 -  { return real_maybe_null() ? test(record[null_offset()] & null_bit) : false; }
  14 +  { return real_maybe_null() ? my_test(record[null_offset()] & null_bit) : false; }
  15
  16    void set_null(my_ptrdiff_t row_offset= 0)
  17    {
  18 @@ -3652,9 +3652,9 @@ public:
  19    {
  20      DBUG_ASSERT(ptr == a || ptr == b);
  21      if (ptr == a)
  22 -      return Field_bit::key_cmp(b, bytes_in_rec+test(bit_len));
  23 +      return Field_bit::key_cmp(b, bytes_in_rec+my_test(bit_len));
  24      else
  25 -      return Field_bit::key_cmp(a, bytes_in_rec+test(bit_len)) * -1;
  26 +      return Field_bit::key_cmp(a, bytes_in_rec+my_test(bit_len)) * -1;
  27    }
  28    int cmp_binary_offset(uint row_offset)
  29    { return cmp_offset(row_offset); }