summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.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_strfunc.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_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 40b18755744..7434f6bd57b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1706,14 +1706,11 @@ inline String* alloc_buffer(String *res,String *str,String *tmp_value,
str->length(length);
return str;
}
- else
- {
- if (tmp_value->alloc(length))
- return 0;
- (void) tmp_value->copy(*res);
- tmp_value->length(length);
- return tmp_value;
- }
+ if (tmp_value->alloc(length))
+ return 0;
+ (void) tmp_value->copy(*res);
+ tmp_value->length(length);
+ return tmp_value;
}
res->length(length);
return res;