merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except

those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).

1 files changed, 2 insertions, 2 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index c01f34b422c..adaa972e162 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3833,13 +3833,13 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
 #undef NOT_FIXED_DEC
     {
       /*
-        The 14 below is to ensure that the server and client has the same
+        DBL_DIG below is to ensure that the server and client has the same
         precisions. This will ensure that on the same machine you get the
         same value as a string independent of the protocol you use.
       */
       sprintf(buff, "%-*.*g", (int) min(sizeof(buff)-1,
                                         param->buffer_length),
-	      min(14,width), value);
+              min(DBL_DIG, width), value);
       end= strcend(buff, ' ');
       *end= 0;
     }