diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/create.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/type_float.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 9 |
4 files changed, 20 insertions, 5 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 92c825f547d..123fdbd90bd 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -413,7 +413,7 @@ explain t2; Field Type Null Key Default Extra a int(11) YES NULL b bigint(11) 0 -c bigint(10) 0 +c bigint(11) 0 d date YES NULL e char(1) f datetime YES NULL @@ -432,11 +432,11 @@ Table Create Table t2 CREATE TABLE `t2` ( `ifnull(a,a)` tinyint(4) default NULL, `ifnull(b,b)` smallint(6) default NULL, - `ifnull(c,c)` mediumint(9) default NULL, + `ifnull(c,c)` mediumint(8) default NULL, `ifnull(d,d)` int(11) default NULL, `ifnull(e,e)` bigint(20) default NULL, - `ifnull(f,f)` float(3,2) default NULL, - `ifnull(g,g)` double(4,3) default NULL, + `ifnull(f,f)` float(24,2) default NULL, + `ifnull(g,g)` double(53,3) default NULL, `ifnull(h,h)` decimal(5,4) default NULL, `ifnull(i,i)` year(4) default NULL, `ifnull(j,j)` date default NULL, diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 6117b0a9a00..a8af3f5f658 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1637,3 +1637,9 @@ ERROR 42S21: Duplicate column name 'c1' alter table t1 add key (c1,c1,c2); ERROR 42S21: Duplicate column name 'c1' drop table t1; +create table t1(a int(1) , b int(1)) engine=innodb; +insert into t1 values ('1111', '3333'); +select distinct concat(a, b) from t1; +concat(a, b) +11113333 +drop table t1; diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index 0906df8f621..319a957498b 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -92,7 +92,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `col1` double default NULL, - `col2` double(22,5) default NULL, + `col2` double(53,5) default NULL, `col3` double default NULL, `col4` double default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 7501889127a..4e18cfb224b 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1168,3 +1168,12 @@ alter table t1 add key (c1,c2,c1); --error 1060 alter table t1 add key (c1,c1,c2); drop table t1; + +# +# Bug #4082: integer truncation +# + +create table t1(a int(1) , b int(1)) engine=innodb; +insert into t1 values ('1111', '3333'); +select distinct concat(a, b) from t1; +drop table t1; |