diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 17:33:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 17:33:35 +0400 |
| commit | 2bcaf2714446a9b8fee7112a51a6c5062ff85ea9 (patch) | |
| tree | 3dbaeee1ed164d6db4c509e6e98b07a5170fb903 /sql/item_func.cc | |
| parent | 7dca4626fb842fa2f5b2d3eb72b2fb608c934970 (diff) | |
| parent | 9d1c240ac2574c18897bb9b88f5f859b0751c1e8 (diff) | |
| download | mariadb-git-2bcaf2714446a9b8fee7112a51a6c5062ff85ea9.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 0f6321244be..427910c3625 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -505,7 +505,10 @@ bool Item_func::is_expensive_processor(uchar *arg) my_decimal *Item_func::val_decimal(my_decimal *decimal_value) { DBUG_ASSERT(fixed); - int2my_decimal(E_DEC_FATAL_ERROR, val_int(), unsigned_flag, decimal_value); + longlong nr= val_int(); + if (null_value) + return 0; /* purecov: inspected */ + int2my_decimal(E_DEC_FATAL_ERROR, nr, unsigned_flag, decimal_value); return decimal_value; } |