bk commit into 5.0 tree (msvensson:1.2173)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2173 06/06/12 10:53:14 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug11589/my50-bug11589
  into  neptunus.(none):/home/msvensson/mysql/bug11589/my50-test_latest

  mysql-test/t/type_float.test
    1.31 06/06/12 10:53:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.47 06/06/12 10:53:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  libmysql/libmysql.c
    1.244 06/06/12 10:53:08 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug11589/my50-test_latest/RESYNC

--- 1.243/libmysql/libmysql.c	2006-05-15 18:07:52 +02:00
+++ 1.244/libmysql/libmysql.c	2006-06-12 10:53:08 +02:00
@@ -3827,7 +3827,15 @@ static void fetch_float_with_conversion(
       sprintf(buff, "%.*f", (int) field->decimals, value);
       end= strend(buff);
     }
-    fetch_string_with_conversion(param, buff, (uint) (end - buff));
+    uint length= (uint) (end-buff);
+    if (field->flags & ZEROFILL_FLAG && length < field->length &&
+        field->length < MAX_DOUBLE_STRING_REP_LENGTH-1)
+    {
+      bmove_upp((char*) buff+field->length,buff+length, length);
+      bfill((char*) buff, field->length - length,'0');
+      length= field->length;
+    }
+    fetch_string_with_conversion(param, buff, length);
     break;
   }
   }

--- 1.46/mysql-test/r/type_float.result	2006-05-13 10:11:37 +02:00
+++ 1.47/mysql-test/r/type_float.result	2006-06-12 10:53:09 +02:00
@@ -266,3 +266,19 @@ create table t1 (s1 float(0,2));
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
 create table t1 (s1 float(1,2));
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
+CREATE TABLE t1 (
+f1 real zerofill,
+f2 double zerofill,
+f3 float zerofill);
+INSERT INTO t1 VALUES ( 0.314152e+1, 0.314152e+1, 0.314152e+1);
+PREPARE stmt1 FROM 'select f1, f2, f3 FROM t1';
+select f1, f2, f3 FROM t1;
+f1	f2	f3
+0000000000000003.14152	0000000000000003.14152	000003.14152
+select f1, f2, f3 FROM t1;
+f1	f2	f3
+0000000000000003.14152	0000000000000003.14152	000003.14152
+EXECUTE stmt1;
+f1	f2	f3
+0000000000000003.14152	0000000000000003.14152	000003.14152
+DROP TABLE t1;

--- 1.30/mysql-test/t/type_float.test	2006-03-22 16:47:41 +01:00
+++ 1.31/mysql-test/t/type_float.test	2006-06-12 10:53:09 +02:00
@@ -188,3 +188,21 @@ drop table t1,t2,t3;
 create table t1 (s1 float(0,2));
 --error 1427
 create table t1 (s1 float(1,2));
+
+#
+# MySQL Bugs: #11589: mysqltest --ps-protocol, strange output, float/double/real with zerofill
+#
+
+CREATE TABLE t1 (
+  f1 real zerofill,
+  f2 double zerofill,
+  f3 float zerofill);
+INSERT INTO t1 VALUES ( 0.314152e+1, 0.314152e+1, 0.314152e+1);
+
+let $my_stmt= select f1, f2, f3 FROM t1;
+eval PREPARE stmt1 FROM '$my_stmt';
+select f1, f2, f3 FROM t1;
+eval $my_stmt;
+EXECUTE stmt1;
+
+DROP TABLE t1;