summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-04-28 21:41:49 +0200
committerSergei Golubchik <serg@mariadb.org>2020-04-29 18:17:08 +0200
commit0bea465ba93f1020d7f829fbd603bdee58fdfb9e (patch)
treec97d12eb856ac7e92edd5318f9a3d205275e12ff
parent4c1ee4e04aed8ac9fd2fc29767676cef057a4ba3 (diff)
downloadmariadb-git-0bea465ba93f1020d7f829fbd603bdee58fdfb9e.tar.gz
correct off-by-one error in CONCAT
CONCAT_WS didn't have it
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index f8f3d913cd8..5fdb1745068 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -539,7 +539,7 @@ String *Item_func_concat::val_str(String *str)
use_as_buff=str; // Put next arg here
}
else if (tmp_value.is_alloced() && res2->ptr() >= tmp_value.ptr() &&
- res2->ptr() <= tmp_value.ptr() + tmp_value.alloced_length())
+ res2->ptr() < tmp_value.ptr() + tmp_value.alloced_length())
{
/*
This happens really seldom: