Commit f1b93086 authored by unknown's avatar unknown
Browse files

Merging 


mysql-test/r/type_float.result:
  merging
parent 57e970db

mysql-test/r/type_float.result

+4 −4
Original line number Diff line number Diff line
@@ -225,10 +225,6 @@ select * from t1 where reckey=1.09E2; 
reckey	recdesc

109	Has 109 as key

drop table t1;

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 (d double(10,1));

create table t2 (d double(10,9));

insert into t1 values ("100000000.0");
@@ -244,3 +240,7 @@ t3 CREATE TABLE `t3` ( 
  `d` double(22,9) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2, t3;

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').