Commit dfc40170 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug11589/my50-bug11589 

into  neptunus.(none):/home/msvensson/mysql/bug11589/my50-test_latest
parents 76f066aa 519bf5b6

libmysql/libmysql.c

+9 −1
Original line number Diff line number Diff line
@@ -3827,7 +3827,15 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
      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;

  }

  }

mysql-test/r/type_float.result

+16 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/type_float.test

+18 −0
Original line number Diff line number Diff line
@@ -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;