summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2003-12-10 22:26:31 +0300
committerunknown <konstantin@mysql.com>2003-12-10 22:26:31 +0300
commitceab00b0c8ac072d83f565ac6c0f86bf8e0c22f3 (patch)
treebbfbb126a26544bfe84128c5ea57d8cc2355ef69 /sql/item_cmpfunc.cc
parent4c00978b43921525d59f52da1ad13b516da16f1e (diff)
downloadmariadb-git-ceab00b0c8ac072d83f565ac6c0f86bf8e0c22f3.tar.gz
cleanup: if there is return from if-part, we don't need else statement
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 63f3a8985c5..82f368970e2 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -463,10 +463,9 @@ static Item_result item_store_type(Item_result a,Item_result b)
{
if (a == STRING_RESULT || b == STRING_RESULT)
return STRING_RESULT;
- else if (a == REAL_RESULT || b == REAL_RESULT)
+ if (a == REAL_RESULT || b == REAL_RESULT)
return REAL_RESULT;
- else
- return INT_RESULT;
+ return INT_RESULT;
}
void