From b24fd86a91519c879c8c31fad9f918d3847ca797 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Sat, 21 Jun 2003 20:17:50 +0500
Subject: [PATCH 1/2] Fix for bug #628

---
 sql/item_strfunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 208be1ecd7f..1edd0e68687 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1482,7 +1482,7 @@ String *Item_func_format::val_str(String *str)
     str= copy_if_not_alloced(&tmp_str,str,length);
     str->length(length);
     tmp= (char*) str->ptr()+length - dec-1;
-    for (pos= (char*) str->ptr()+length ; pos != tmp; pos--)
+    for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)
       pos[0]= pos[-(int) diff];
     while (diff)
     {

From 95d6b7a5ea235c9ac29264598d6672a7031cc4ee Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Thu, 3 Jul 2003 16:48:47 +0500
Subject: [PATCH 2/2] Testcase for #628

---
 mysql-test/r/func_misc.result | 3 +++
 mysql-test/t/func_misc.test   | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 8d05adcc1ba..d51bea020ed 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -13,3 +13,6 @@ NULL	255.255.1.255	0.0.1.255
 select length(format('nan', 2)) > 0;
 length(format('nan', 2)) > 0
 1
+select concat("$",format(2500,2));
+concat("$",format(2500,2))
+$2,500.00
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index be64c170fa1..d15c26279ec 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -12,3 +12,8 @@ select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511);
 # Test for core dump with nan
 #
 select length(format('nan', 2)) > 0;
+
+#
+# Test for bug #628
+#
+select concat("$",format(2500,2));