diff options
Diffstat (limited to 'mysql-test/suite/vcol/r/vcol_misc.result')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index a09939c8cc2..17b2f2af00d 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -102,7 +102,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `v1` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL); INSERT IGNORE INTO t1 VALUES (0,1,0); @@ -129,8 +129,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(32) DEFAULT NULL, - `v` char(32) CHARACTER SET ucs2 GENERATED ALWAYS AS (`a`) VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `v` char(32) CHARACTER SET ucs2 COLLATE ucs2_general_ci GENERATED ALWAYS AS (`a`) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a int, b int); CREATE TABLE t2 (a int, b int as (a+1) VIRTUAL); @@ -155,7 +155,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(2) NOT NULL, `c` enum('Y','N') GENERATED ALWAYS AS (case when `b` = 'aa' then 'Y' else 'N' end) STORED -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1(a,b) values (1,'bb'), (2,'aa'), (3,'cc'); select * from t1; a b c @@ -173,7 +173,7 @@ t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, `c` set('y','n') GENERATED ALWAYS AS (if(`a` = 0,if(`b` = 0,'n,n','n,y'),if(`b` = 0,'y,n','y,y'))) STORED -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t2(a,b) values (7,0), (2,3), (0,1); select * from t2; a b c @@ -247,7 +247,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL, `b` bigint(20) GENERATED ALWAYS AS (`a` > 2) VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 (a) values (1),(3); select * from t1; a b @@ -264,7 +264,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL, `b` bigint(20) GENERATED ALWAYS AS (`a` between 0 and 2) VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 (a) values (1),(3); select * from t1; a b @@ -281,7 +281,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL, `b` char(10) GENERATED ALWAYS AS (`a` between 0 and 2) VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 (a) values (1),(3); select * from t1; a b @@ -305,7 +305,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(32) DEFAULT NULL, `c` int(11) GENERATED ALWAYS AS (`a` MOD 10) VIRTUAL, `d` varchar(5) GENERATED ALWAYS AS (left(`b`,5)) STORED -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra a int(11) NO NULL @@ -344,7 +344,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `v1` varchar(255) GENERATED ALWAYS AS (`c1`) STORED, - `c1` varchar(50) COLLATE latin1_general_ci DEFAULT NULL + `c1` varchar(50) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci drop table t1; set sql_mode='no_zero_date'; @@ -395,7 +395,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL, `b` timestamp GENERATED ALWAYS AS (cast(`a` as datetime)) VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a DATETIME, b TIMESTAMP AS (TIMESTAMP(a)),c TIMESTAMP); SHOW CREATE TABLE t1; @@ -404,7 +404,7 @@ t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL, `b` timestamp GENERATED ALWAYS AS (cast(`a` as datetime)) VIRTUAL, `c` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # MDEV-8839 COLUMN_GET() produces warnings with no data @@ -542,10 +542,10 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` char(1) CHARACTER SET ucs2 COLLATE ucs2_test_ci DEFAULT NULL, - `v1` char(1) CHARACTER SET ucs2 GENERATED ALWAYS AS (`c1`) VIRTUAL, + `v1` char(1) CHARACTER SET ucs2 COLLATE ucs2_test_ci GENERATED ALWAYS AS (`c1`) VIRTUAL, `v2` int(11) GENERATED ALWAYS AS (`c1` = 'b') VIRTUAL, `v3` int(11) GENERATED ALWAYS AS (`v1` = 'b') VIRTUAL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; # # End of 10.2 tests |