mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

The compiler warnings fixed.

Browse source
This commit is contained in:
Oleksandr Byelkin 2015-09-24 10:28:47 +02:00
parent 29ac245dd0
commit 5cc149feba
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/item_cmpfunc.cc
View file

@ -2692,7 +2692,7 @@ Item_func_if::str_op(String *str)
String *res=arg->val_str(str); String *res=arg->val_str(str);
if (res) if (res)
res->set_charset(collation.collation); res->set_charset(collation.collation);
if (null_value=arg->null_value) if ((null_value=arg->null_value))
res= NULL; res= NULL;
return res; return res;
} }
@ -2704,7 +2704,7 @@ Item_func_if::decimal_op(my_decimal *decimal_value)
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
Item *arg= args[0]->val_bool() ? args[1] : args[2]; Item *arg= args[0]->val_bool() ? args[1] : args[2];
my_decimal *value= arg->val_decimal(decimal_value); my_decimal *value= arg->val_decimal(decimal_value);
if (null_value= arg->null_value) if ((null_value= arg->null_value))
value= NULL; value= NULL;
return value; return value;
} }