diff options
| author | monty@mashka.mysql.fi <> | 2003-01-14 14:28:36 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-14 14:28:36 +0200 |
| commit | 7e9b27eaf5e4add82c98fb8cf87ad68ea72de6a8 (patch) | |
| tree | 7a63ba29620ada893aa14d1984554e0af0a0deaa /sql/item_sum.cc | |
| parent | c9dc5a206bd162b10a3a1a2bebc054cf3c5a6ed0 (diff) | |
| download | mariadb-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.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d78e535010f..b15fceda686 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -341,7 +341,8 @@ double Item_sum_hybrid::val() switch (hybrid_type) { case STRING_RESULT: 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); case INT_RESULT: if (unsigned_flag) return ulonglong2double(sum_int); |