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

   1 $NetBSD$
   2
   3 --- sql/item.h.orig     2013-05-05 20:52:25.000000000 +0000
   4 +++ sql/item.h
   5 @@ -1637,7 +1637,7 @@ public:
   6    {
   7      if (is_expensive_cache < 0)
   8        is_expensive_cache= walk(&Item::is_expensive_processor, 0, (uchar*)0);
   9 -    return test(is_expensive_cache);
  10 +    return my_test(is_expensive_cache);
  11    }
  12    virtual bool can_be_evaluated_now() const;
  13    uint32 max_char_length() const
  14 @@ -2578,7 +2578,7 @@ public:
  15    virtual void print(String *str, enum_query_type query_type);
  16    Item_num *neg() { value= -value; return this; }
  17    uint decimal_precision() const
  18 -  { return (uint)(max_length - test(value < 0)); }
  19 +  { return (uint)(max_length - my_test(value < 0)); }
  20    bool eq(const Item *, bool binary_cmp) const;
  21    bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
  22  };
  23 @@ -4168,7 +4168,7 @@ public:
  24    virtual void store(Item *item);
  25    virtual bool cache_value()= 0;
  26    bool basic_const_item() const
  27 -  { return test(example && example->basic_const_item());}
  28 +  { return my_test(example && example->basic_const_item());}
  29    bool walk (Item_processor processor, bool walk_subquery, uchar *argument);
  30    virtual void clear() { null_value= TRUE; value_cached= FALSE; }
  31    bool is_null() { return value_cached ? null_value : example->is_null(); }