mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changed tests

Browse source 
sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge
This commit is contained in:
unknown 2005-01-18 12:25:56 -08:00
commit 8e5a74a6b6
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/r/type_float.result
View file

@ -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;

7
mysql-test/t/type_float.test
View file

@ -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));

1
sql/field_conv.cc
View file

@ -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() &&