Commit 8e5a74a6 authored by unknown's avatar unknown
Browse files

Merge changed tests 


sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge
parents ca252acb 80377495

mysql-test/r/type_float.result

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ f 
9.999

9.999

drop table if exists t1;

create table t1 (d1 double, d2 double unsigned);

insert into t1 set d1 = -1.0;

update t1 set d2 = d1;

select * from t1;

d1	d2

-1	0

drop table t1;

create table t1 (c char(20));

insert into t1 values (5e-28);

select * from t1;

mysql-test/t/type_float.test

+7 −0
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ create table t1 (f float(54)); # Should give an error 
drop table if exists t1;

--enable_warnings



# Don't allow 'double unsigned' to be set to a negative value (Bug #7700)

create table t1 (d1 double, d2 double unsigned);

insert into t1 set d1 = -1.0;

update t1 set d2 = d1;

select * from t1;

drop table t1;



# Ensure that maximum values as the result of number of decimals

# being specified in table schema are enforced (Bug #7361)

create table t1 (f float(4,3));

sql/field_conv.cc

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ void field_conv(Field *to,Field *from) 
  if (to->real_type() == from->real_type())

  {

    if (to->pack_length() == from->pack_length() &&

        !(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) &&

	to->real_type() != FIELD_TYPE_ENUM &&

	to->real_type() != FIELD_TYPE_SET &&

        from->charset() == to->charset() &&