diff options
| author | unknown <serg@serg.mylan> | 2005-01-16 16:41:38 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-16 16:41:38 +0100 |
| commit | 3c45559db8e6185afcf0c19cb493bebf4e444b5a (patch) | |
| tree | 397a1b90e7ba6f409bc1f6a75cc40fef09d4732c /sql/item_sum.h | |
| parent | e4f887ad20db0fb16d6851acb05c0410c11f63e3 (diff) | |
| parent | 193eae3bece02daa473f0e264d235ea3e407a88d (diff) | |
| download | mariadb-git-3c45559db8e6185afcf0c19cb493bebf4e444b5a.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index cec611b8854..d1e82387944 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -739,9 +739,10 @@ class Item_func_group_concat : public Item_sum String *res; char *end_ptr; int error; - res= val_str(&str_value); + if (!(res= val_str(&str_value))) + return (longlong) 0; end_ptr= (char*) res->ptr()+ res->length(); - return res ? my_strtoll10(res->ptr(), &end_ptr, &error) : (longlong) 0; + return my_strtoll10(res->ptr(), &end_ptr, &error); } String* val_str(String* str); Item *copy_or_same(THD* thd); |