diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-11 12:50:30 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-11 12:50:30 -0700 |
| commit | 092a238864591bc540beb00145759fa6af5f2746 (patch) | |
| tree | c335f34a9ea54e39c6bfc046986fec3fb820db98 /sql/item_func.h | |
| parent | 7c87385e3075143de18e50c1d327eeb2e224603a (diff) | |
| download | mariadb-git-092a238864591bc540beb00145759fa6af5f2746.tar.gz | |
Fixed a problem of the patch for mdev-5105 that caused valgrind complains.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 310b312d1e4..b3ce85b96c4 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -488,17 +488,20 @@ class Item_int_func :public Item_func protected: bool sargable; public: - Item_int_func() :Item_func() { max_length= 21; } - Item_int_func(Item *a) :Item_func(a) { max_length= 21; } - Item_int_func(Item *a,Item *b) :Item_func(a,b) { max_length= 21; } + Item_int_func() :Item_func() { max_length= 21; sargable= false; } + Item_int_func(Item *a) :Item_func(a) { max_length= 21; sargable= false; } + Item_int_func(Item *a,Item *b) :Item_func(a,b) + { max_length= 21; sargable= false; } Item_int_func(Item *a,Item *b,Item *c) :Item_func(a,b,c) - { max_length= 21; } - Item_int_func(List<Item> &list) :Item_func(list) { max_length= 21; } - Item_int_func(THD *thd, Item_int_func *item) :Item_func(thd, item) {} + { max_length= 21; sargable= false; } + Item_int_func(List<Item> &list) :Item_func(list) + { max_length= 21; sargable= false; } + Item_int_func(THD *thd, Item_int_func *item) :Item_func(thd, item) + { sargable= false;} double val_real(); String *val_str(String*str); enum Item_result result_type () const { return INT_RESULT; } - void fix_length_and_dec() { sargable= false; } + void fix_length_and_dec() {} bool count_sargable_conds(uchar *arg); }; |