summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2003-12-10 15:39:38 +0300
committerunknown <konstantin@mysql.com>2003-12-10 15:39:38 +0300
commit4c00978b43921525d59f52da1ad13b516da16f1e (patch)
treedf29727502f9d0d89a64b163dd99ca990ffb296a /sql
parent4119451ba1065274be6435349a786f7995fd4dae (diff)
parent06d008c69d8695ce28dc14f27bee483e21eb7b64 (diff)
downloadmariadb-git-4c00978b43921525d59f52da1ad13b516da16f1e.tar.gz
Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
Diffstat (limited to 'sql')
-rw-r--r--sql/item_sum.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 5a5934db0cd..e18fa83e49d 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -104,12 +104,13 @@ Item_sum_num::val_str(String *str)
String *
Item_sum_int::val_str(String *str)
{
- longlong nr=val_int();
+ longlong nr= val_int();
if (null_value)
return 0;
- char buff[21];
- uint length= (uint) (longlong10_to_str(nr,buff,-10)-buff);
- str->copy(buff,length);
+ if (unsigned_flag)
+ str->set((ulonglong) nr);
+ else
+ str->set(nr);
return str;
}