databases/mysql56-client/patches/patch-sql_item__cmpfunc.cc

   1 $NetBSD$
   2
   3 --- sql/item_cmpfunc.cc.orig    2013-05-05 20:55:22.000000000 +0000
   4 +++ sql/item_cmpfunc.cc
   5 @@ -497,7 +497,7 @@ static bool convert_constant_item(THD *t
   6                                       *item) :
   7  #endif
   8            new Item_int_with_ref(field->val_int(), *item,
   9 -                                test(field->flags & UNSIGNED_FLAG));
  10 +                                my_test(field->flags & UNSIGNED_FLAG));
  11          if (tmp)
  12            thd->change_item_tree(item, tmp);
  13          result= 1;                              // Item was replaced
  14 @@ -1425,8 +1425,8 @@ int Arg_comparator::compare_e_string()
  15    res1= (*a)->val_str(&value1);
  16    res2= (*b)->val_str(&value2);
  17    if (!res1 || !res2)
  18 -    return test(res1 == res2);
  19 -  return test(sortcmp(res1, res2, cmp_collation.collation) == 0);
  20 +    return my_test(res1 == res2);
  21 +  return my_test(sortcmp(res1, res2, cmp_collation.collation) == 0);
  22  }
  23
  24
  25 @@ -1436,8 +1436,8 @@ int Arg_comparator::compare_e_binary_str
  26    res1= (*a)->val_str(&value1);
  27    res2= (*b)->val_str(&value2);
  28    if (!res1 || !res2)
  29 -    return test(res1 == res2);
  30 -  return test(stringcmp(res1, res2) == 0);
  31 +    return my_test(res1 == res2);
  32 +  return my_test(stringcmp(res1, res2) == 0);
  33  }
  34
  35
  36 @@ -1492,8 +1492,8 @@ int Arg_comparator::compare_e_real()
  37    double val1= (*a)->val_real();
  38    double val2= (*b)->val_real();
  39    if ((*a)->null_value || (*b)->null_value)
  40 -    return test((*a)->null_value && (*b)->null_value);
  41 -  return test(val1 == val2);
  42 +    return my_test((*a)->null_value && (*b)->null_value);
  43 +  return my_test(val1 == val2);
  44  }
  45
  46  int Arg_comparator::compare_e_decimal()
  47 @@ -1502,8 +1502,8 @@ int Arg_comparator::compare_e_decimal()
  48    my_decimal *val1= (*a)->val_decimal(&decimal1);
  49    my_decimal *val2= (*b)->val_decimal(&decimal2);
  50    if ((*a)->null_value || (*b)->null_value)
  51 -    return test((*a)->null_value && (*b)->null_value);
  52 -  return test(my_decimal_cmp(val1, val2) == 0);
  53 +    return my_test((*a)->null_value && (*b)->null_value);
  54 +  return my_test(my_decimal_cmp(val1, val2) == 0);
  55  }
  56
  57
  58 @@ -1541,8 +1541,8 @@ int Arg_comparator::compare_e_real_fixed
  59    double val1= (*a)->val_real();
  60    double val2= (*b)->val_real();
  61    if ((*a)->null_value || (*b)->null_value)
  62 -    return test((*a)->null_value && (*b)->null_value);
  63 -  return test(val1 == val2 || fabs(val1 - val2) < precision);
  64 +    return my_test((*a)->null_value && (*b)->null_value);
  65 +  return my_test(val1 == val2 || fabs(val1 - val2) < precision);
  66  }
  67
  68
  69 @@ -1616,8 +1616,8 @@ int Arg_comparator::compare_e_time_packe
  70    longlong val1= (*a)->val_time_temporal();
  71    longlong val2= (*b)->val_time_temporal();
  72    if ((*a)->null_value || (*b)->null_value)
  73 -    return test((*a)->null_value && (*b)->null_value);
  74 -  return test(val1 == val2);
  75 +    return my_test((*a)->null_value && (*b)->null_value);
  76 +  return my_test(val1 == val2);
  77  }
  78
  79
  80 @@ -1708,8 +1708,8 @@ int Arg_comparator::compare_e_int()
  81    longlong val1= (*a)->val_int();
  82    longlong val2= (*b)->val_int();
  83    if ((*a)->null_value || (*b)->null_value)
  84 -    return test((*a)->null_value && (*b)->null_value);
  85 -  return test(val1 == val2);
  86 +    return my_test((*a)->null_value && (*b)->null_value);
  87 +  return my_test(val1 == val2);
  88  }
  89
  90  /**
  91 @@ -1720,8 +1720,8 @@ int Arg_comparator::compare_e_int_diff_s
  92    longlong val1= (*a)->val_int();
  93    longlong val2= (*b)->val_int();
  94    if ((*a)->null_value || (*b)->null_value)
  95 -    return test((*a)->null_value && (*b)->null_value);
  96 -  return (val1 >= 0) && test(val1 == val2);
  97 +    return my_test((*a)->null_value && (*b)->null_value);
  98 +  return (val1 >= 0) && my_test(val1 == val2);
  99  }
 100
 101  int Arg_comparator::compare_row()