From 64c59b37f899e520f6ba3ff8d0f9724423eb9b88 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Fri, 29 Oct 2004 16:06:51 +0500
Subject: [PATCH] item_strfunc.cc:   Unnecessary code was removed.

---
 sql/item_strfunc.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index c51894afde4..2d9f7e7bff8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -643,7 +643,12 @@ void Item_func_concat_ws::fix_length_and_dec()
   if (agg_arg_collations(collation, args, arg_count))
     return;
 
-  max_length= arg_count > 1 ? args[0]->max_length * (arg_count - 2) : 0;
+  /*
+     arg_count cannot be less than 2,
+     it is done on parser level in sql_yacc.yy
+     so, (arg_count - 2) is safe here.
+  */
+  max_length= args[0]->max_length * (arg_count - 2);
   for (uint i=1 ; i < arg_count ; i++)
     max_length+=args[i]->max_length;