summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-05-19 11:10:06 +0300
committerunknown <monty@hundin.mysql.fi>2002-05-19 11:10:06 +0300
commiteb8f4be476eab1f4b03d1e47bd52a6e7437c3095 (patch)
tree7d6cac7d6357418f6b85ae82dcdb0e7532fca077 /sql/item_strfunc.cc
parent1503a4724e9bd65826cf7547240c4e03f773d2a0 (diff)
parent2880330c7213783705524a8d7ef866746448d3d1 (diff)
downloadmariadb-git-eb8f4be476eab1f4b03d1e47bd52a6e7437c3095.tar.gz
merge
Docs/glibc-2.2.5.patch: Auto merged Docs/manual.texi: Auto merged sql/item_strfunc.cc: Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
-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 9d24ca19b4c..9c6681cdcbf 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -475,7 +475,7 @@ null:
void Item_func_concat_ws::fix_length_and_dec()
{
- max_length=0;
+ max_length=separator->max_length*(arg_count-1);
for (uint i=0 ; i < arg_count ; i++)
max_length+=args[i]->max_length;
if (max_length > MAX_BLOB_WIDTH)