diff options
| author | Mikael Ronström <mikael@dator9> | 2011-02-10 18:15:19 +0100 |
|---|---|---|
| committer | Mikael Ronström <mikael@dator9> | 2011-02-10 18:15:19 +0100 |
| commit | 80179eba3e0cfd12f4bf6860b193ffa09f8dfde0 (patch) | |
| tree | 47a4be74fb4e90a025c800c4e4290a9427824390 /sql/item_func.cc | |
| parent | 24f72c368cf94bb4b5ea71944e1ececbd7994672 (diff) | |
| parent | a726555523a0ce00d250224b726a9332f593c0a7 (diff) | |
| download | mariadb-git-80179eba3e0cfd12f4bf6860b193ffa09f8dfde0.tar.gz | |
merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index b7532951230..e28d8b8bcc4 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4484,7 +4484,7 @@ my_decimal *user_var_entry::val_decimal(my_bool *null_value, my_decimal *val) int2my_decimal(E_DEC_FATAL_ERROR, *(longlong*) value, 0, val); break; case DECIMAL_RESULT: - val= (my_decimal *)value; + my_decimal2decimal((my_decimal *) value, val); break; case STRING_RESULT: str2my_decimal(E_DEC_FATAL_ERROR, value, length, collation.collation, val); |