From 0d9ab525692ecc50c7c30cc4c365d3af6dcba29e Mon Sep 17 00:00:00 2001
From: unknown <aivanov@mysql.com>
Date: Tue, 26 Jul 2005 20:37:12 +0400
Subject: [PATCH] BUG# <no-such-number> : some fix

mysql-test/t/select.test:
  BUG# <no-such-number>
---
 mysql-test/t/select.test | 2 ++
 sql/item_strfunc.cc      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 3ae5839cd3c..b716b318a7e 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -2162,4 +2162,6 @@ select found_rows();
 select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
 select found_rows();
 
+#BUG#234321
+select 2+23;
 DROP TABLE t1;
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 3a5ddd583ef..ebdde5481c8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2130,7 +2130,9 @@ void Item_func_lpad::fix_length_and_dec()
   {
     ulonglong length= ((ulonglong) args[1]->val_int() *
                        collation.collation->mbmaxlen);
-    length= max((ulonglong) args[0]->max_length, length);
+    /*a comment before */
+    length= max((ulonglong)args[0]->max_length, length);
+    /*a comment after */
     if (length >= MAX_BLOB_WIDTH)
     {
       length= MAX_BLOB_WIDTH;