diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-05-29 11:16:30 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-05-29 11:16:30 +0200 |
| commit | 7782446197aedeb9b50efcef830d6991e0948072 (patch) | |
| tree | 92d5e7f5a365a3031ab50391b8c828f8d0e16316 /sql/item_func.cc | |
| parent | 5d8c8803bd08bdba6c8714bfe8037c87e39f3962 (diff) | |
| parent | 8998080a379f64fc779e79f978e15b43a002e7c5 (diff) | |
| download | mariadb-git-7782446197aedeb9b50efcef830d6991e0948072.tar.gz | |
Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug28250/my50-bug28250
into dl145s.mysql.com:/users/mhansson/mysql/push/bug28250/my51-bug28250
mysql-test/t/cast.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 712689af451..1fcc967ca4f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -994,6 +994,8 @@ longlong Item_func_unsigned::val_int() my_decimal tmp, *dec= args[0]->val_decimal(&tmp); if (!(null_value= args[0]->null_value)) my_decimal2int(E_DEC_FATAL_ERROR, dec, 1, &value); + else + value= 0; return value; } else if (args[0]->cast_to_int_type() != STRING_RESULT || |