diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:38:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:38:55 +0300 |
| commit | 1c587481966abc7a9ad5309d0a91ca920f7a5657 (patch) | |
| tree | 28b936bd807cab0ba7b82e4cc9ec963fa6de6307 /mysql-test/main/ctype_ucs.result | |
| parent | 17be2b47ba32535e69e28da9a444e528ba8ab155 (diff) | |
| parent | eae968f62d285de97ed607c87bc131cd863d5d03 (diff) | |
| download | mariadb-git-1c587481966abc7a9ad5309d0a91ca920f7a5657.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/ctype_ucs.result')
| -rw-r--r-- | mysql-test/main/ctype_ucs.result | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index 48b866b64f5..dc3ed0cf7a9 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -1950,21 +1950,23 @@ drop table t1; select hex(concat(ceiling(0.5))); hex(concat(ceiling(0.5))) 0031 -create table t1 as select concat(ceiling(0.5)) as c1; +create table t1 as select ceiling(0.5) as c0, concat(ceiling(0.5)) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET ucs2 DEFAULT NULL + `c0` int(3) NOT NULL, + `c1` varchar(3) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(floor(0.5))); hex(concat(floor(0.5))) 0030 -create table t1 as select concat(floor(0.5)) as c1; +create table t1 as select floor(0.5) as c0, concat(floor(0.5)) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET ucs2 DEFAULT NULL + `c0` int(3) NOT NULL, + `c1` varchar(3) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(round(0.5))); |