diff --git a/mysql-test/columnstore/autopilot/r/mcs4000_autopilot_data_compression_type.result b/mysql-test/columnstore/autopilot/r/mcs4000_autopilot_data_compression_type.result index 289aaad9c..71c523fdd 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4000_autopilot_data_compression_type.result +++ b/mysql-test/columnstore/autopilot/r/mcs4000_autopilot_data_compression_type.result @@ -26,7 +26,7 @@ orders CREATE TABLE `orders` ( `o_clerk` char(15) DEFAULT NULL, `o_shippriority` int(11) DEFAULT NULL, `o_comment` varchar(79) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set columnstore_compression_type=1; CREATE TABLE lineitem ( l_orderkey int, @@ -65,7 +65,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs4000_db'; schema tablename columnname compressiontype mcs4000_db orders o_orderkey 2 diff --git a/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result b/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result index 67b16a8b0..b7f2b5f7f 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result +++ b/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result @@ -1206,7 +1206,7 @@ t1 CREATE TABLE `t1` ( `o598_totalprice` decimal(12,2) DEFAULT NULL, `o599_orderdate` date DEFAULT NULL, `o600_orderpriority` char(15) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH','Clerk#000000193',0,'g pinto beans will have to sleep f',292,23,'F',30783.05,'1992-01-13','2-HIGH'),(1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT','Clerk#000000890',0,'t the carefully regular dugouts. s',1248,49,'F',210713.88,'1992-01-02','1-URGENT'); SELECT COUNT(*) FROM t1; COUNT(*) diff --git a/mysql-test/columnstore/autopilot/r/mcs4003_autopilot_batchInsert_insertSelect.result b/mysql-test/columnstore/autopilot/r/mcs4003_autopilot_batchInsert_insertSelect.result index 8b7fdd78a..b2c38d805 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4003_autopilot_batchInsert_insertSelect.result +++ b/mysql-test/columnstore/autopilot/r/mcs4003_autopilot_batchInsert_insertSelect.result @@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists lineitem1; create table lineitem1 ( l_orderkey int, @@ -78,7 +78,7 @@ lineitem1 CREATE TABLE `lineitem1` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into lineitem values (10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'), (10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'), diff --git a/mysql-test/columnstore/autopilot/r/mcs4004_autopilot_batchInsert_ldi.result b/mysql-test/columnstore/autopilot/r/mcs4004_autopilot_batchInsert_ldi.result index f112fe891..b72665c30 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4004_autopilot_batchInsert_ldi.result +++ b/mysql-test/columnstore/autopilot/r/mcs4004_autopilot_batchInsert_ldi.result @@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists lineitem1; create table lineitem1 ( l_orderkey int, @@ -78,7 +78,7 @@ lineitem1 CREATE TABLE `lineitem1` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into lineitem values (10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'), (10,128449,3474,3,27,39890.88,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake.'), diff --git a/mysql-test/columnstore/autopilot/r/mcs4005_autopilot_add_drop_columns.result b/mysql-test/columnstore/autopilot/r/mcs4005_autopilot_add_drop_columns.result index 6fd0d1741..488da387f 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4005_autopilot_add_drop_columns.result +++ b/mysql-test/columnstore/autopilot/r/mcs4005_autopilot_add_drop_columns.result @@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table lineitem add column CBIGINT BIGINT; alter table lineitem add column CDECIMAL1 DECIMAL(1); alter table lineitem add column CDECIMAL4 DECIMAL(4); diff --git a/mysql-test/columnstore/autopilot/r/mcs4006_autopilot_create_dbt3_database_1m.result b/mysql-test/columnstore/autopilot/r/mcs4006_autopilot_create_dbt3_database_1m.result index ef3912d48..6816059a8 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4006_autopilot_create_dbt3_database_1m.result +++ b/mysql-test/columnstore/autopilot/r/mcs4006_autopilot_create_dbt3_database_1m.result @@ -16,7 +16,7 @@ nation CREATE TABLE `nation` ( `n_name` char(25) DEFAULT NULL, `n_regionkey` int(11) DEFAULT NULL, `n_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists region; create table region ( r_regionkey int, @@ -29,7 +29,7 @@ region CREATE TABLE `region` ( `r_regionkey` int(11) DEFAULT NULL, `r_name` char(25) DEFAULT NULL, `r_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists customer; create table customer ( c_custkey int, @@ -52,7 +52,7 @@ customer CREATE TABLE `customer` ( `c_acctbal` decimal(12,2) DEFAULT NULL, `c_mktsegment` char(10) DEFAULT NULL, `c_comment` varchar(117) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists orders; create table orders ( o_orderkey int, @@ -77,7 +77,7 @@ orders CREATE TABLE `orders` ( `o_clerk` char(15) DEFAULT NULL, `o_shippriority` int(11) DEFAULT NULL, `o_comment` varchar(79) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists supplier; create table supplier ( s_suppkey int, @@ -98,7 +98,7 @@ supplier CREATE TABLE `supplier` ( `s_phone` char(15) DEFAULT NULL, `s_acctbal` decimal(12,2) DEFAULT NULL, `s_comment` varchar(101) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists partsupp; create table partsupp ( ps_partkey int, @@ -115,7 +115,7 @@ partsupp CREATE TABLE `partsupp` ( `ps_availqty` int(11) DEFAULT NULL, `ps_supplycost` decimal(12,2) DEFAULT NULL, `ps_comment` varchar(199) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists part; create table part ( p_partkey int, @@ -140,7 +140,7 @@ part CREATE TABLE `part` ( `p_container` char(10) DEFAULT NULL, `p_retailprice` decimal(12,2) DEFAULT NULL, `p_comment` varchar(23) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists lineitem; create table lineitem ( l_orderkey int, @@ -179,7 +179,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOAD DATA INFILE '/data/qa/source/dbt3/1m/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1m/region.tbl' INTO TABLE region FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1m/customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|'; diff --git a/mysql-test/columnstore/autopilot/r/mcs4007_autopilot_dbt3_performance_queries_1g.result b/mysql-test/columnstore/autopilot/r/mcs4007_autopilot_dbt3_performance_queries_1g.result index a59ffdc53..4a2c28f56 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4007_autopilot_dbt3_performance_queries_1g.result +++ b/mysql-test/columnstore/autopilot/r/mcs4007_autopilot_dbt3_performance_queries_1g.result @@ -16,7 +16,7 @@ nation CREATE TABLE `nation` ( `n_name` char(25) DEFAULT NULL, `n_regionkey` int(11) DEFAULT NULL, `n_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists region; create table region ( r_regionkey int, @@ -29,7 +29,7 @@ region CREATE TABLE `region` ( `r_regionkey` int(11) DEFAULT NULL, `r_name` char(25) DEFAULT NULL, `r_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists customer; create table customer ( c_custkey int, @@ -52,7 +52,7 @@ customer CREATE TABLE `customer` ( `c_acctbal` decimal(12,2) DEFAULT NULL, `c_mktsegment` char(10) DEFAULT NULL, `c_comment` varchar(117) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists orders; create table orders ( o_orderkey int, @@ -77,7 +77,7 @@ orders CREATE TABLE `orders` ( `o_clerk` char(15) DEFAULT NULL, `o_shippriority` int(11) DEFAULT NULL, `o_comment` varchar(79) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists supplier; create table supplier ( s_suppkey int, @@ -98,7 +98,7 @@ supplier CREATE TABLE `supplier` ( `s_phone` char(15) DEFAULT NULL, `s_acctbal` decimal(12,2) DEFAULT NULL, `s_comment` varchar(101) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists partsupp; create table partsupp ( ps_partkey int, @@ -115,7 +115,7 @@ partsupp CREATE TABLE `partsupp` ( `ps_availqty` int(11) DEFAULT NULL, `ps_supplycost` decimal(12,2) DEFAULT NULL, `ps_comment` varchar(199) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists part; create table part ( p_partkey int, @@ -140,7 +140,7 @@ part CREATE TABLE `part` ( `p_container` char(10) DEFAULT NULL, `p_retailprice` decimal(12,2) DEFAULT NULL, `p_comment` varchar(23) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table if exists lineitem; create table lineitem ( l_orderkey int, @@ -179,7 +179,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOAD DATA INFILE '/data/qa/source/dbt3/1g/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1g/region.tbl' INTO TABLE region FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1g/customer.tbl' INTO TABLE customer FIELDS TERMINATED BY '|'; diff --git a/mysql-test/columnstore/autopilot/r/mcs4009_autopilot_partition_management.result b/mysql-test/columnstore/autopilot/r/mcs4009_autopilot_partition_management.result index 4ffafae46..cd2f698a9 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4009_autopilot_partition_management.result +++ b/mysql-test/columnstore/autopilot/r/mcs4009_autopilot_partition_management.result @@ -39,7 +39,7 @@ lineitem CREATE TABLE `lineitem` ( `l_shipinstruct` char(25) DEFAULT NULL, `l_shipmode` char(10) DEFAULT NULL, `l_comment` varchar(44) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|'; LOAD DATA INFILE '/data/qa/source/dbt3/1g/lineitem.tbl' INTO TABLE lineitem FIELDS TERMINATED BY '|'; diff --git a/mysql-test/columnstore/autopilot/r/mcs4010_autopilot_cross_engine_join.result b/mysql-test/columnstore/autopilot/r/mcs4010_autopilot_cross_engine_join.result index 3fd21c493..3b6280f30 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4010_autopilot_cross_engine_join.result +++ b/mysql-test/columnstore/autopilot/r/mcs4010_autopilot_cross_engine_join.result @@ -18,7 +18,7 @@ nation CREATE TABLE `nation` ( `n_name` char(25) DEFAULT NULL, `n_regionkey` int(11) DEFAULT NULL, `n_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOAD DATA INFILE '/data/qa/source/dbt3/1m/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|'; create table region ( r_regionkey int, @@ -31,7 +31,7 @@ region CREATE TABLE `region` ( `r_regionkey` int(11) DEFAULT NULL, `r_name` char(25) DEFAULT NULL, `r_comment` varchar(152) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into region values (1, 'AMERICA', 'hs use ironic, even requests. s'); insert into region values (2, 'ASIA', 'ges. thinly even pinto beans ca'); select count(*) from nation n, region r where n.n_regionkey = r.r_regionkey and r.r_regionkey = 2; diff --git a/mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats.result similarity index 92% rename from mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats_KnownIssue.result rename to mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats.result index e0efef5c1..4d502d47e 100644 --- a/mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats_KnownIssue.result +++ b/mysql-test/columnstore/autopilot/r/mcs4011_autopilot_query_stats.result @@ -19,7 +19,7 @@ nation CREATE TABLE `nation` ( `n_name` char(25) DEFAULT NULL, `n_regionkey` int(11) DEFAULT NULL, `n_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci RENAME TABLE nation to nation1; drop table if exists nation; create table nation ( @@ -35,7 +35,7 @@ nation CREATE TABLE `nation` ( `n_name` char(25) DEFAULT NULL, `n_regionkey` int(11) DEFAULT NULL, `n_comment` varchar(152) DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci LOAD DATA INFILE '/data/qa/source/dbt3/1m/nation.tbl' INTO TABLE nation FIELDS TERMINATED BY '|'; select count(*) from nation where n_regionkey = 2; count(*) diff --git a/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test similarity index 100% rename from mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats_KnownIssue.test rename to mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test diff --git a/mysql-test/columnstore/devregression/r/mcs7631_q111.result b/mysql-test/columnstore/devregression/r/mcs7631_q111.result index 56ee98be2..5adcf6957 100644 --- a/mysql-test/columnstore/devregression/r/mcs7631_q111.result +++ b/mysql-test/columnstore/devregression/r/mcs7631_q111.result @@ -13,7 +13,7 @@ Table Create Table to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\ CREATE TABLE `to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\` ( `i` int(11) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table `to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\`; show create table `to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\`; ERROR 42S02: Table 'tpch1.to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\' doesn't exist diff --git a/mysql-test/columnstore/devregression/r/mcs7632_q112.result b/mysql-test/columnstore/devregression/r/mcs7632_q112.result index ede265f11..60de7c115 100644 --- a/mysql-test/columnstore/devregression/r/mcs7632_q112.result +++ b/mysql-test/columnstore/devregression/r/mcs7632_q112.result @@ -14,7 +14,7 @@ Table Create Table to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\ CREATE TABLE "to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\" ( "some" int(11) DEFAULT NULL, "t" text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table "to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\"; show create table "to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\"; ERROR 42S02: Table 'tpch1.to!@#$%^&*$#,()[].;:+-|/%^<>=!&|@\' doesn't exist diff --git a/mysql-test/columnstore/devregression/r/mcs7633_q113.result b/mysql-test/columnstore/devregression/r/mcs7633_q113.result index c5849a1a2..7748eb9c9 100644 --- a/mysql-test/columnstore/devregression/r/mcs7633_q113.result +++ b/mysql-test/columnstore/devregression/r/mcs7633_q113.result @@ -13,7 +13,7 @@ Table Create Table z k CREATE TABLE `z k` ( `a b` int(11) DEFAULT NULL, `c300_500_18 REF NOx` text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table tpch1.`z k`; show create table `z k`; ERROR 42S02: Table 'tpch1.z k' doesn't exist diff --git a/mysql-test/columnstore/devregression/r/mcs7634_q211.result b/mysql-test/columnstore/devregression/r/mcs7634_q211.result index 9376047f6..a30fa7a85 100644 --- a/mysql-test/columnstore/devregression/r/mcs7634_q211.result +++ b/mysql-test/columnstore/devregression/r/mcs7634_q211.result @@ -21,7 +21,7 @@ Table Create Table cs3 CREATE TABLE `cs3` ( `i` int(11) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from `test023_cs3`.`cs3` where i = 1; update `test023_cs3`.`cs3` set i = 5 where i = 10; select * from `test023_cs3`.`cs3`; diff --git a/mysql-test/columnstore/devregression/r/mcs7635_q212.result b/mysql-test/columnstore/devregression/r/mcs7635_q212.result index df42f84b9..178390bc9 100644 --- a/mysql-test/columnstore/devregression/r/mcs7635_q212.result +++ b/mysql-test/columnstore/devregression/r/mcs7635_q212.result @@ -22,7 +22,7 @@ Table Create Table cs3 CREATE TABLE "cs3" ( "i" int(11) DEFAULT NULL, "t" text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from "test023_cs3"."cs3" where i = 1; update "test023_cs3"."cs3" set i = 5 where i = 10; select * from "test023_cs3"."cs3"; diff --git a/mysql-test/columnstore/devregression/r/mcs7636_q213.result b/mysql-test/columnstore/devregression/r/mcs7636_q213.result index f59ed58a2..f8b91f88e 100644 --- a/mysql-test/columnstore/devregression/r/mcs7636_q213.result +++ b/mysql-test/columnstore/devregression/r/mcs7636_q213.result @@ -25,7 +25,7 @@ Table Create Table cs3 CREATE TABLE `cs3` ( `i` int(11) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci delete from `test023_cs3`.`cs3` where i = 1; update `test023_cs3`.`cs3` set i = 5 where i = 10; select * from `test023_cs3`.`cs3`; @@ -41,7 +41,7 @@ cs3 CREATE TABLE `cs3` ( `i` int(11) DEFAULT NULL, `t` text DEFAULT NULL, `nt` text DEFAULT NULL -) ENGINE=Columnstore DEFAULT CHARSET=latin1 +) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table `test023_cs3`.`cs3`; show create table `test023_cs3`.`cs3`; ERROR 42S02: Table 'test023_cs3.cs3' doesn't exist