From 5cc149febaad181cac65903a62dfe507ae4b6f76 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Thu, 24 Sep 2015 10:28:47 +0200
Subject: [PATCH] The compiler warnings fixed.

---
 sql/item_cmpfunc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 4f07318d1fd..1d4771ae133 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2692,7 +2692,7 @@ Item_func_if::str_op(String *str)
   String *res=arg->val_str(str);
   if (res)
     res->set_charset(collation.collation);
-  if (null_value=arg->null_value)
+  if ((null_value=arg->null_value))
     res= NULL;
   return res;
 }
@@ -2704,7 +2704,7 @@ Item_func_if::decimal_op(my_decimal *decimal_value)
   DBUG_ASSERT(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   my_decimal *value= arg->val_decimal(decimal_value);
-  if (null_value= arg->null_value)
+  if ((null_value= arg->null_value))
     value= NULL;
   return value;
 }