summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-01-14 14:28:36 +0200
committermonty@mashka.mysql.fi <>2003-01-14 14:28:36 +0200
commit7e9b27eaf5e4add82c98fb8cf87ad68ea72de6a8 (patch)
tree7a63ba29620ada893aa14d1984554e0af0a0deaa /sql/item_sum.h
parentc9dc5a206bd162b10a3a1a2bebc054cf3c5a6ed0 (diff)
downloadmariadb-git-7e9b27eaf5e4add82c98fb8cf87ad68ea72de6a8.tar.gz
Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index d16a1f2224e..ffc9558822d 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -484,7 +484,8 @@ public:
double val()
{
String *res; res=val_str(&str_value);
- return res ? my_strntod(res->charset(),res->ptr(),res->length(),(char**) 0) : 0.0;
+ return res ? my_strntod(res->charset(),(char*) res->ptr(),res->length(),
+ (char**) 0) : 0.0;
}
longlong val_int()
{