mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

automerge 5.1-security --> 5.5-security (bug 57187)

Browse source
This commit is contained in:
Gleb Shchepa 2010-12-08 17:36:52 +03:00
commit 92f09cd1d3
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_func.cc
View file

@ -4470,7 +4470,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);