summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-02-12 21:55:37 +0200
committermonty@mashka.mysql.fi <>2003-02-12 21:55:37 +0200
commite327393e9d2f8df0e2239464bb96a3eafd9de03b (patch)
tree3ac37e452f15c8f05e9d1f338a6050281f838048 /sql/item_sum.h
parent15aee374560aa905995b1c5af8ac91bc2c0638c2 (diff)
downloadmariadb-git-e327393e9d2f8df0e2239464bb96a3eafd9de03b.tar.gz
Fixed a lot of wrong memory references as reported by valgrind
Portability fixes Added new client function: mysql_get_server_version() New server help code (From Victor Vagin) Fixed wrong usage of binary() Disabled RTREE usage for now.
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index be92f37f2a7..db8bded9946 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -369,9 +369,11 @@ class Item_sum_hybrid :public Item_sum
enum_field_types hybrid_field_type;
int cmp_sign;
table_map used_table_cache;
+ int (*str_cmp_function)(const String *x,const String *y);
public:
- Item_sum_hybrid(Item *item_par,int sign) :Item_sum(item_par),cmp_sign(sign),
+ Item_sum_hybrid(Item *item_par,int sign)
+ :Item_sum(item_par), hybrid_type(INT_RESULT), cmp_sign(sign),
used_table_cache(~(table_map) 0)
{}
Item_sum_hybrid(THD *thd, Item_sum_hybrid &item):