MCOL-5519: new defaults in columnstore.cnf (#2894)

feat(charset)!: utf8 is a new charset default and utf8_general_ci is a new collation default in the engine configuration file shipped --------- Co-authored-by: Leonid Fedorov <leonid.fedorov@mariadb.com> Co-authored-by: mariadb-DanielLee <daniel.lee@mariadb.com>
2025-04-18 21:44:02 +03:00 · 2023-08-15 11:04:32 -04:00 · 2023-08-15 11:04:32 -04:00 · 64f1d541d0
commit 64f1d541d0
parent 712d34a407
50 changed files with 139 additions and 165 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -311,8 +311,6 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
      'docker exec -t mtr$${DRONE_BUILD_NUMBER} chown -R mysql:mysql ' + mtr_path,
      // disable systemd 'ProtectSystem' (we need to write to /usr/share/)
      "docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c 'sed -i /ProtectSystem/d $(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//)'",
-      if (pkg_format == 'deb') then 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "echo character_set_server=latin1 >> /etc/mysql/mariadb.conf.d/columnstore.cnf"' else 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "echo character_set_server=latin1 >> /etc/my.cnf.d/columnstore.cnf"',
-      if (pkg_format == 'deb') then 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "echo collation_server=latin1_swedish_ci >> /etc/mysql/mariadb.conf.d/columnstore.cnf"' else 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "echo collation_server=latin1_swedish_ci >> /etc/my.cnf.d/columnstore.cnf"',
      'docker exec -t mtr$${DRONE_BUILD_NUMBER} systemctl daemon-reload',
      'docker exec -t mtr$${DRONE_BUILD_NUMBER} systemctl start mariadb',
      'docker exec -t mtr$${DRONE_BUILD_NUMBER} mariadb -e "create database if not exists test;"',
@ -407,9 +405,6 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
      'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/^.mariadb.$/a lower_case_table_names=1" ' + config_path_prefix + 'server.cnf',
      // set default client character set to utf-8
      'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/^.client.$/a default-character-set=utf8" ' + config_path_prefix + 'client.cnf',
-      // Regression tests hacks to pass on debs
-      if (pkg_format == 'deb') then 'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/character-set-server/d" ' + config_path_prefix + 'server.cnf',
-      if (pkg_format == 'deb') then 'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/collation-server/d" ' + config_path_prefix + 'server.cnf',
      // Set RAM consumption limits to avoid RAM contention b/w mtr andregression steps.
      //'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "/usr/bin/mcsSetConfig HashJoin TotalUmMemory 5G"',
      //'docker exec -t regressin$${DRONE_BUILD_NUMBER} bash -c "/usr/bin/mcsSetConfig DBBC NumBlocksPct 2G"',
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@ -1,20 +1,7 @@
 [mysqld]
 plugin-load-add=ha_columnstore.so

-# Enable compression by default on create, set to NONE to turn off
-#columnstore_compression_type=SNAPPY
+collation_server = utf8_general_ci
+character_set_server = utf8

-# ColumnStore local query flag
-#columnstore_local_query=0
-
-#columnstore_diskjoin_smallsidelimit=0
-#columnstore_diskjoin_largesidelimit=0
-#columnstore_diskjoin_bucketsize=100
-#columnstore_um_mem_limit=0
-
-# Required for Schema Sync
-#server-id = 1
-#log_bin
-
-# Uncomment for this UM to apply slave DML on ColumnStore tables
-#columnstore_replication_slave=ON
+columnstore_use_import_for_batchinsert = ON
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs4000_db';
 schema	tablename	columnname	compressiontype
 mcs4000_db	orders	o_orderkey	2
--- a/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4001_autopilot_wide_table_600columns.result
--- a/mysql-test/columnstore/autopilot/r/mcs4002_autopilot_large_insert.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4002_autopilot_large_insert.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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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.'),
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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.'),
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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.'),
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 alter table lineitem add column CBIGINT BIGINT;
 alter table lineitem add column CDECIMAL1 DECIMAL(1);
 alter table lineitem add column CDECIMAL4 DECIMAL(4);
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 '|';
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 '|';
--- a/mysql-test/columnstore/autopilot/r/mcs4008_autopilot_sanity_test.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4008_autopilot_sanity_test.result
@ -25,7 +25,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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 drop table if exists lineitem;
 create table lineitem (
 l_orderkey int,
@ -64,14 +64,14 @@ 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 create table if not exists quicktest (c1 int, c2 char(15)) engine=columnstore;
 SHOW CREATE TABLE quicktest;
 Table	Create Table
 quicktest	CREATE TABLE `quicktest` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(15) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 insert into quicktest values (1,'Hello');
 insert into quicktest values (2,'world');
 select * from quicktest;
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 COLLATE=latin1_swedish_ci
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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;
--- a/mysql-test/columnstore/basic/r/func_json_quote.result
+++ b/mysql-test/columnstore/basic/r/func_json_quote.result
@ -69,7 +69,7 @@ SELECT
 FROM
 t2;
 l
-我
+?
 SET
 NAMES 'utf8';
 # All should be the Chinese "I" i.e. 我
--- a/mysql-test/columnstore/basic/r/mcol_2000.result
+++ b/mysql-test/columnstore/basic/r/mcol_2000.result
@ -139,19 +139,19 @@ copy3	CREATE TABLE `copy3` (
  `l` date DEFAULT NULL,
  `m` datetime DEFAULT NULL,
  `o` time DEFAULT NULL,
-  `s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `s` char(17) DEFAULT NULL,
  `t` varchar(17) CHARACTER SET utf8mb4 DEFAULT NULL,
  `w` tinyblob DEFAULT NULL,
  `x` tinyblob DEFAULT NULL,
  `y` blob DEFAULT NULL,
  `z` mediumblob DEFAULT NULL,
  `aa` longblob DEFAULT NULL,
-  `bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `bb` tinytext DEFAULT NULL,
  `cc` tinytext CHARACTER SET utf8mb4 DEFAULT NULL,
  `dd` text CHARACTER SET utf8mb4 DEFAULT NULL,
  `ee` mediumtext CHARACTER SET utf8mb4 DEFAULT NULL,
  `ff` longtext CHARACTER SET utf8mb4 DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 drop table orig;
 drop table copy1;
 drop table copy2;
@ -219,31 +219,31 @@ insert into cs3 values (_utf8mb4 0xE1B482, '2020-10-25 01:02:07',
 '1234567890', '2020-10-25 01:02:08',
 'abc', '2020-10-25 01:02:09',
 'cde', '2020-10-25 01:02:10');
-ERROR 22007: Incorrect string value: '\xE1\xB4\x82' for column `test_mcol2000`.`cs3`.`a` at row 1
 select * from cs3;
 a	b	c	d	e	f	g	h
 1	2020-10-25 01:02:04	1234567890	2020-10-25 01:02:05	abc	2020-10-25 01:02:06	cde	2020-10-25 01:02:07
 1	2020-10-25 01:02:06	1234567890	2020-10-25 01:02:07	abc	2020-10-25 01:02:08	cde	2020-10-25 01:02:09
+?	2020-10-25 01:02:07	1234567890	2020-10-25 01:02:08	abc	2020-10-25 01:02:09	cde	2020-10-25 01:02:10
 commit;
 select column_name, data_type, character_maximum_length, character_octet_length from information_schema.columns where table_schema='test_mcol2000' and table_name='cs3';
 column_name	data_type	character_maximum_length	character_octet_length
-a	varchar	1	1
+a	varchar	1	3
 b	datetime	NULL	NULL
-c	varchar	10	10
+c	varchar	10	30
 d	datetime	NULL	NULL
-e	varchar	240	240
+e	varchar	240	720
 f	datetime	NULL	NULL
-g	varchar	2000	2000
+g	varchar	2000	6000
 h	datetime	NULL	NULL
 select column_name, data_type, column_length from information_schema.columnstore_columns where hex(table_schema)=hex('test_mcol2000') and hex(table_name)=hex('cs3');
 column_name	data_type	column_length
-a	varchar	1
+a	varchar	3
 b	datetime	8
-c	varchar	10
+c	varchar	30
 d	datetime	8
-e	varchar	240
+e	varchar	720
 f	datetime	8
-g	varchar	2000
+g	varchar	6000
 h	datetime	8
 drop table if exists cs1;
 drop table if exists cs2;
@ -583,23 +583,23 @@ a	b	c	d	e	f	g	h
 1	2020-10-25 01:02:06	1234567890	2020-10-25 01:02:07	abc	2020-10-25 01:02:08	cde	2020-10-25 01:02:09
 select column_name, data_type, character_maximum_length, character_octet_length from information_schema.columns where table_schema='test_mcol2000' and table_name='cs3';
 column_name	data_type	character_maximum_length	character_octet_length
-a	char	1	1
+a	char	1	3
 b	datetime	NULL	NULL
-c	char	10	10
+c	char	10	30
 d	datetime	NULL	NULL
-e	char	240	240
+e	char	240	720
 f	datetime	NULL	NULL
-g	char	255	255
+g	char	255	765
 h	datetime	NULL	NULL
 select column_name, data_type, column_length from information_schema.columnstore_columns where hex(table_schema)=hex('test_mcol2000') and hex(table_name)=hex('cs3');
 column_name	data_type	column_length
-a	char	1
+a	char	3
 b	datetime	8
-c	char	10
+c	char	30
 d	datetime	8
-e	char	240
+e	char	720
 f	datetime	8
-g	char	255
+g	char	765
 h	datetime	8
 drop table if exists cs1;
 drop table if exists cs2;
@ -953,13 +953,13 @@ a	tinytext	255	255
 b	datetime	NULL	NULL
 c	tinytext	255	255
 d	datetime	NULL	NULL
-e	tinytext	255	255
+e	text	65535	65535
 f	datetime	NULL	NULL
 g	text	65535	65535
 h	datetime	NULL	NULL
-i	text	65535	65535
+i	mediumtext	16777215	16777215
 j	datetime	NULL	NULL
-k	mediumtext	16777215	16777215
+k	longtext	4294967295	4294967295
 l	datetime	NULL	NULL
 select column_name, data_type, column_length from information_schema.columnstore_columns where hex(table_schema)=hex('test_mcol2000') and hex(table_name)=hex('cs3');
 column_name	data_type	column_length
@ -967,11 +967,11 @@ a	text	255
 b	datetime	8
 c	text	255
 d	datetime	8
-e	text	255
+e	text	65535
 f	datetime	8
 g	text	65535
 h	datetime	8
-i	text	65535
+i	text	16777215
 j	datetime	8
 k	text	16777215
 l	datetime	8
--- a/mysql-test/columnstore/basic/r/mcs117_create_utf8.result
+++ b/mysql-test/columnstore/basic/r/mcs117_create_utf8.result
@ -20,7 +20,7 @@ SHOW CREATE TABLE имя_таблицы_в_кодировке_утф8_длино
 Table	Create Table
 имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48	CREATE TABLE `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48` (
  `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` int(11) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE VIEW имя_вью_кодировке_утф8_длиной_больше_чем_42 AS SELECT * FROM имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 SHOW CREATE VIEW  имя_вью_кодировке_утф8_длиной_больше_чем_42;
 View	Create View	character_set_client	collation_connection
--- a/mysql-test/columnstore/basic/r/mcs12_alter_table.result
+++ b/mysql-test/columnstore/basic/r/mcs12_alter_table.result
@ -15,7 +15,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM mcs12_db1.t1;
 a	c1
 1	a
@ -29,7 +29,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM t1;
 a	c1
 1	a
@ -44,7 +44,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM t2;
 a	c1
 1	a
@ -59,7 +59,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM t1;
 a	c1
 1	a
@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
  `c` char(10) DEFAULT NULL,
  `t` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
  `i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE t1 DROP COLUMN t;
 SHOW CREATE TABLE t1;
 Table	Create Table
@ -92,7 +92,7 @@ t1	CREATE TABLE `t1` (
  `i` int(11) DEFAULT NULL,
  `c` char(10) DEFAULT NULL,
  `i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM t1;
 i	c	i2
 1	a	NULL
@ -106,7 +106,7 @@ t1	CREATE TABLE `t1` (
  `new_i` int(11) DEFAULT NULL,
  `c` char(10) DEFAULT NULL,
  `i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM t1;
 new_i	c	i2
 1	a	NULL
@ -122,7 +122,7 @@ SHOW CREATE TABLE mcs12_db1.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `i` int(11) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE mcs12_db1.t1 ADD COLUMN c CHAR(10);
 INSERT INTO mcs12_db1.t1 VALUES (1, 'a'),(2, 'b');
 connection addconroot2;
@ -141,7 +141,7 @@ t1	CREATE TABLE `t1` (
  `i` int(11) DEFAULT NULL,
  `c` char(10) DEFAULT NULL,
  `i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM mcs12_db1.t1;
 i	c	i2
 1	a	NULL
--- a/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result
+++ b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result
@ -16,7 +16,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE IF EXISTS nonexisting;
 Warnings:
 Note	1051	Unknown table 'mcs13_db1.nonexisting'
@ -52,7 +52,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `c1` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT * FROM mcs13_db1.t1;
 a	c1
 1	a
--- a/mysql-test/columnstore/basic/r/mcs169_bin_functions.result
+++ b/mysql-test/columnstore/basic/r/mcs169_bin_functions.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT BIN(2);
 BIN(2)
 10
--- a/mysql-test/columnstore/basic/r/mcs171_null_functions.result
+++ b/mysql-test/columnstore/basic/r/mcs171_null_functions.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT IFNULL(NULL, 'abc');
 IFNULL(NULL, 'abc')
 abc
--- a/mysql-test/columnstore/basic/r/mcs173_coalesce_function.result
+++ b/mysql-test/columnstore/basic/r/mcs173_coalesce_function.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT COALESCE(NULL, NULL, NULL, 'mariadb', NULL, 'columnstore');
 COALESCE(NULL, NULL, NULL, 'mariadb', NULL, 'columnstore')
 mariadb
--- a/mysql-test/columnstore/basic/r/mcs174_case_function.result
+++ b/mysql-test/columnstore/basic/r/mcs174_case_function.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT b, c, (CASE WHEN a = 'b' THEN b ELSE c END) FROM t1;
 b	c	(CASE WHEN a = 'b' THEN b ELSE c END)
 NULL	0000-00-00 00:00:00	0000-00-00 00:00:00
--- a/mysql-test/columnstore/basic/r/mcs175_convert_functions.result
+++ b/mysql-test/columnstore/basic/r/mcs175_convert_functions.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT CONVERT(123, CHAR);
 CONVERT(123, CHAR)
 123
--- a/mysql-test/columnstore/basic/r/mcs176_if_function.result
+++ b/mysql-test/columnstore/basic/r/mcs176_if_function.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT IF(10<20, 1, 2);
 IF(10<20, 1, 2)
 1
--- a/mysql-test/columnstore/basic/r/mcs178_adddate_function.result
+++ b/mysql-test/columnstore/basic/r/mcs178_adddate_function.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT ADDDATE('2020-02-02 22:22:22', 1);
 ADDDATE('2020-02-02 22:22:22', 1)
 2020-02-03 22:22:22
--- a/mysql-test/columnstore/basic/r/mcs179_addtime_function.result
+++ b/mysql-test/columnstore/basic/r/mcs179_addtime_function.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT ADDTIME('2020-02-02 22:22:22', '2 1:1:1');
 ADDTIME('2020-02-02 22:22:22', '2 1:1:1')
 2020-02-04 23:23:23
--- a/mysql-test/columnstore/basic/r/mcs180_ascii_function.result
+++ b/mysql-test/columnstore/basic/r/mcs180_ascii_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` char(1) DEFAULT NULL,
  `b` int(11) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT ASCII(0);
 ASCII(0)
 48
--- a/mysql-test/columnstore/basic/r/mcs181_between_and.result
+++ b/mysql-test/columnstore/basic/r/mcs181_between_and.result
@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT 1 BETWEEN 2 AND 3;
 1 BETWEEN 2 AND 3
 0
--- a/mysql-test/columnstore/basic/r/mcs182_char_length_function.result
+++ b/mysql-test/columnstore/basic/r/mcs182_char_length_function.result
@ -8,7 +8,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` varchar(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT CHAR_LENGTH('MariaDB');
 CHAR_LENGTH('MariaDB')
 7
@ -41,7 +41,7 @@ t1	CREATE TABLE `t1` (
  `b` int(11) DEFAULT NULL,
  `c` datetime DEFAULT NULL,
  `d` double DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT a, CHARACTER_LENGTH(a) FROM t1 ORDER BY a;
 a	CHARACTER_LENGTH(a)
 NULL	NULL
--- a/mysql-test/columnstore/basic/r/mcs183_date_function.result
+++ b/mysql-test/columnstore/basic/r/mcs183_date_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` date DEFAULT NULL,
  `b` datetime DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT DATE('1212-12-12 11:11:11');
 DATE('1212-12-12 11:11:11')
 1212-12-12
--- a/mysql-test/columnstore/basic/r/mcs184_day_function.result
+++ b/mysql-test/columnstore/basic/r/mcs184_day_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` date DEFAULT NULL,
  `b` datetime DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT DAY('1212-12-12 11:11:11');
 DAY('1212-12-12 11:11:11')
 12
--- a/mysql-test/columnstore/basic/r/mcs185_dayname_function.result
+++ b/mysql-test/columnstore/basic/r/mcs185_dayname_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` date DEFAULT NULL,
  `b` datetime DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT DAYNAME('1212-12-12 11:11:11');
 DAYNAME('1212-12-12 11:11:11')
 Wednesday
--- a/mysql-test/columnstore/basic/r/mcs186_dayofyear_function.result
+++ b/mysql-test/columnstore/basic/r/mcs186_dayofyear_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` date DEFAULT NULL,
  `b` datetime DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT DAYOFYEAR('1212-12-12 11:11:11');
 DAYOFYEAR('1212-12-12 11:11:11')
 347
--- a/mysql-test/columnstore/basic/r/mcs187_dayofmonth_function.result
+++ b/mysql-test/columnstore/basic/r/mcs187_dayofmonth_function.result
@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` date DEFAULT NULL,
  `b` datetime DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT DAYOFMONTH('1212-12-12 11:11:11');
 DAYOFMONTH('1212-12-12 11:11:11')
 12
--- a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
+++ b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
@ -43,7 +43,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `col` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 col
--- a/mysql-test/columnstore/basic/r/mcs1_create_table_data_types.result
+++ b/mysql-test/columnstore/basic/r/mcs1_create_table_data_types.result
@ -29,7 +29,7 @@ t1	CREATE TABLE `t1` (
  `t1_INT` int(11) DEFAULT NULL,
  `t1_BIGINT` bigint(20) DEFAULT NULL,
  `t1_BIGINT_UNSIGNED` bigint(20) unsigned DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t2
 (
 t2_DECIMAL_10_3 DECIMAL(10,3),
@ -48,7 +48,7 @@ t2	CREATE TABLE `t2` (
  `t2_DOUBLE_UNSIGNED` double unsigned DEFAULT NULL,
  `t2_FLOAT` float DEFAULT NULL,
  `t2_FLOAT_UNSIGNED` float unsigned DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t3
 (
 t3_BLOB BLOB,
@ -77,7 +77,7 @@ t3	CREATE TABLE `t3` (
  `t3_TINYTEXT` tinytext DEFAULT NULL,
  `t3_MEDIUMTEXT` mediumtext DEFAULT NULL,
  `t3_LONGTEXT` longtext DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t4
 (
 t4_DATE DATE,
@ -98,7 +98,7 @@ t4	CREATE TABLE `t4` (
  `t4_TIME_4` time(4) DEFAULT NULL,
  `t4_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
  `t4_TIMESTAMP_5` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t5
 (
 t5_INT INT,
@ -123,5 +123,5 @@ t5	CREATE TABLE `t5` (
  `t5_DATE` date DEFAULT NULL,
  `t5_TIME` time DEFAULT NULL,
  `t5_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp()
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP DATABASE mcs1_db;
--- a/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
+++ b/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
@ -18,7 +18,7 @@ t1	CREATE TABLE `t1` (
  `t1_TEXT` text DEFAULT NULL,
  `t1_DATE` date DEFAULT NULL,
  `t1_TIME` time DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 set columnstore_compression_type=1;
 CREATE TABLE t2
 (
@ -36,7 +36,7 @@ t2	CREATE TABLE `t2` (
  `t2_TEXT` text DEFAULT NULL,
  `t2_DATE` date DEFAULT NULL,
  `t2_TIME` time DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2;
 schema	tablename	columnname	compressiontype
 mcs229_db	t1	t1_int	2
--- a/mysql-test/columnstore/basic/r/mcs271_substring_index_function.result
+++ b/mysql-test/columnstore/basic/r/mcs271_substring_index_function.result
@ -49,14 +49,14 @@ q00q00q00q00q00
 stu vwx yz
 SELECT SUBSTRING_INDEX(t1_TEXT, '00', -3) FROM t1 ORDER BY 1;
 SUBSTRING_INDEX(t1_TEXT, '00', -3)
-0q00q00
 abcde//fghijk//lm
 pqr stu vwx yz
+q00q00
 SELECT SUBSTRING_INDEX(t1_TEXT, '00', -3) FROM t1 ORDER BY 1;
 SUBSTRING_INDEX(t1_TEXT, '00', -3)
-0q00q00
 abcde//fghijk//lm
 pqr stu vwx yz
+q00q00
 SELECT SUBSTRING_INDEX(t1_DATE, '-', 3) FROM t1 ORDER BY 1;
 SUBSTRING_INDEX(t1_DATE, '-', 3)
 1997-12-12
--- a/mysql-test/columnstore/basic/r/mcs28_load_data_local_infile.result
+++ b/mysql-test/columnstore/basic/r/mcs28_load_data_local_infile.result
@ -48,9 +48,11 @@ Warnings:
 Note	1265	Data truncated for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
 Warning	1366	Incorrect integer value: 'error      ' for column `mcs28_db1`.`t1`.`a` at row 3
+Warning	1265	Data truncated for column 'b' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
 Note	1265	Data truncated for column 'a' at row 4
 Warning	1366	Incorrect integer value: 'wrong end  ' for column `mcs28_db1`.`t1`.`a` at row 5
+Warning	1265	Data truncated for column 'b' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 SELECT * FROM t1 ORDER BY a, b;
 a	b
@ -63,21 +65,18 @@ TRUNCATE TABLE t1;
 LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/loaddata4.dat' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' LINES TERMINATED BY '' IGNORE 1 LINES;;
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
-Note	1265	Data truncated for column 'a' at row 2
-Note	1265	Data truncated for column 'a' at row 3
-Warning	1366	Incorrect integer value: '
-' for column `mcs28_db1`.`t1`.`a` at row 4
-Warning	1261	Row 4 doesn't contain data for all columns
+Warning	1265	Data truncated for column 'b' at row 1
+Warning	1366	Incorrect integer value: '  
+' for column `mcs28_db1`.`t1`.`a` at row 2
+Warning	1261	Row 2 doesn't contain data for all columns
 SELECT * FROM t1 ORDER BY a, b;
 a	b
 0	NULL
-1	row 1
-2	row 2
-3	row 3
+2	 row 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL,
  `b` char(10) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP DATABASE IF EXISTS mcs28_db1;
--- a/mysql-test/columnstore/basic/r/mcs5_create_table_from_other_tables.result
+++ b/mysql-test/columnstore/basic/r/mcs5_create_table_from_other_tables.result
@ -9,7 +9,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t3(col0 varchar(45) DEFAULT 'abc') ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t3;
 Table	Create Table
@ -17,7 +17,7 @@ t3	CREATE TABLE `t3` (
  `col0` varchar(45) DEFAULT 'abc',
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t4(col0 varchar(45)) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t4;
 Table	Create Table
@ -25,34 +25,34 @@ t4	CREATE TABLE `t4` (
  `col0` varchar(45) DEFAULT NULL,
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t5(c0 int) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t6(c0 int) ENGINE=Columnstore AS SELECT c1 FROM t1_ctas;
 SHOW CREATE TABLE t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t7 ENGINE=Columnstore SELECT c1 AS c11 FROM t1_ctas;
 SHOW CREATE TABLE t7;
 Table	Create Table
 t7	CREATE TABLE `t7` (
  `c11` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t8 ENGINE=Columnstore SELECT c0,c1 FROM t1_ctas WHERE c1='bar';
 SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t9(col0 varchar(45), c0 int DEFAULT 10) ENGINE=Columnstore SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t9;
 Table	Create Table
@ -60,7 +60,7 @@ t9	CREATE TABLE `t9` (
  `col0` varchar(45) DEFAULT NULL,
  `c0` int(11) DEFAULT 10,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t2_ctas (c0 int, c1 char(20), PRIMARY KEY (c1))ENGINE=Innodb;
 INSERT INTO t2_ctas VALUES (1, 'foo'), (2, 'bar'), (3, 'disco');
 CREATE TABLE t10 ENGINE=Columnstore AS SELECT * FROM t1_ctas;
@ -69,7 +69,7 @@ Table	Create Table
 t10	CREATE TABLE `t10` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t11(col0 varchar(45) DEFAULT 'abc') ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t11;
 Table	Create Table
@ -77,7 +77,7 @@ t11	CREATE TABLE `t11` (
  `col0` varchar(45) DEFAULT 'abc',
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t12(col0 varchar(45)) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t12;
 Table	Create Table
@ -85,34 +85,34 @@ t12	CREATE TABLE `t12` (
  `col0` varchar(45) DEFAULT NULL,
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t13(c0 int) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t14(c0 int) ENGINE=Columnstore AS SELECT c1 FROM t1_ctas;
 SHOW CREATE TABLE t14;
 Table	Create Table
 t14	CREATE TABLE `t14` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t15 ENGINE=Columnstore SELECT c1 AS c11 FROM t1_ctas;
 SHOW CREATE TABLE t15;
 Table	Create Table
 t15	CREATE TABLE `t15` (
  `c11` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t16 ENGINE=Columnstore SELECT c0,c1 FROM t1_ctas WHERE c1='bar';
 SHOW CREATE TABLE t16;
 Table	Create Table
 t16	CREATE TABLE `t16` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t17(col0 varchar(45), c0 int DEFAULT 10) ENGINE=Columnstore SELECT * FROM t1_ctas;
 SHOW CREATE TABLE t17;
 Table	Create Table
@ -120,7 +120,7 @@ t17	CREATE TABLE `t17` (
  `col0` varchar(45) DEFAULT NULL,
  `c0` int(11) DEFAULT 10,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t1_like(c0 int, c1 char(20)) ENGINE=Columnstore;
 CREATE TABLE t18 LIKE t1_like;
 SHOW CREATE TABLE t18;
@ -128,7 +128,7 @@ Table	Create Table
 t18	CREATE TABLE `t18` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t2_like(c0 int, c1 char(20), PRIMARY KEY (c1))ENGINE=Innodb;
 CREATE TABLE t19 LIKE t2_like;
 SHOW CREATE TABLE t19;
@ -137,5 +137,5 @@ t19	CREATE TABLE `t19` (
  `c0` int(11) DEFAULT NULL,
  `c1` char(20) NOT NULL,
  PRIMARY KEY (`c1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP DATABASE mcs5_db;
--- a/mysql-test/columnstore/basic/r/mcs74_check_constraint.result
+++ b/mysql-test/columnstore/basic/r/mcs74_check_constraint.result
@ -8,7 +8,7 @@ t1	CREATE TABLE `t1` (
  `t1_int` int(11) DEFAULT NULL,
  `t1_char` char(5) DEFAULT NULL,
  CONSTRAINT `CONSTRAINT_1` CHECK (`t1_int` > 0)
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 INSERT INTO t1 VALUES(NULL, NULL);
 INSERT INTO t1 VALUES(1, 'a');
 INSERT INTO t1 VALUES(0, 'b');
@ -25,7 +25,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
  `t1_char` char(10) DEFAULT NULL,
  CONSTRAINT `c1` CHECK (`t1_char` = '')
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 INSERT INTO t2 VALUES();
 INSERT INTO t2 VALUES('');
 INSERT INTO t2 VALUES('aaaa');
@ -51,7 +51,7 @@ t3	CREATE TABLE `t3` (
  CONSTRAINT `t3_check_date` CHECK (`t3_datetime` >= '1212-12-12 12:12:12'),
  CONSTRAINT `t3_check_decimal` CHECK (`t3_decimal` < 888.88),
  CONSTRAINT `t3_check_blob` CHECK (`t3_blob` = 'aaaa')
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 INSERT INTO t3(t3_decimal) VALUES(NULL);
 INSERT INTO t3(t3_decimal) VALUES(888.87);
 INSERT INTO t3(t3_decimal) VALUES(888.88);
--- a/mysql-test/columnstore/basic/r/mcs7_create_table_with_metadata.result
+++ b/mysql-test/columnstore/basic/r/mcs7_create_table_with_metadata.result
@ -14,7 +14,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` varchar(30) DEFAULT NULL,
  `c2` int(11) DEFAULT NULL COMMENT '0123456789'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COMMENT='abcdefghijklmnopqrstuvwxyz'
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='abcdefghijklmnopqrstuvwxyz'
 CREATE TABLE t2 (c1 INTEGER COMMENT '0123456789') ENGINE=Columnstore;
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t2' AND table_schema='mcs7_db';
 table_comment	char_length(table_comment)
@ -26,7 +26,7 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
  `c1` int(11) DEFAULT NULL COMMENT '0123456789'
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t3 (c1 VARCHAR(40))COMMENT='abcdefghijklmnopqrstuvwxyz' ENGINE=Columnstore;
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t3' AND table_schema='mcs7_db';
 table_comment	char_length(table_comment)
@ -38,7 +38,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
  `c1` varchar(40) DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COMMENT='abcdefghijklmnopqrstuvwxyz'
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='abcdefghijklmnopqrstuvwxyz'
 CREATE TABLE t4 (c1 INTEGER) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde' ENGINE=Columnstore;
 ERROR HY000: Comment for table 't4' is too long (max = 2048)
 CREATE TABLE t5 (col1 INT COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde')ENGINE=Columnstore;
--- a/mysql-test/columnstore/basic/r/mcs87_alter_column.result
+++ b/mysql-test/columnstore/basic/r/mcs87_alter_column.result
@ -1,7 +1,7 @@
 DROP DATABASE IF EXISTS mcs87_db;
 CREATE DATABASE mcs87_db;
 USE mcs87_db;
-CREATE TABLE t1 (c1 INT, c2 CHAR(1)) ENGINE=Columnstore;
+CREATE TABLE t1 (c1 INT, c2 CHAR(1)) ENGINE=Columnstore CHARSET=latin1 COLLATE=latin1_swedish_ci;
 INSERT INTO t1 VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e');
 ALTER TABLE t1 ADD COLUMN c11 INT NOT NULL;
 ERROR HY000: Internal error: Table is not empty. New column has to have a default value if NOT NULL required.
--- a/mysql-test/columnstore/basic/r/mcs8_create_table_with_constraints.result
+++ b/mysql-test/columnstore/basic/r/mcs8_create_table_with_constraints.result
@ -6,13 +6,13 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `col1` smallint(6) DEFAULT 10
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t2(col1 TINYINT  NOT NULL)ENGINE=Columnstore;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
  `col1` tinyint(4) NOT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE INDEX on t2(col1);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on t2(col1)' at line 1
 CREATE TABLE t3(col1 INT, CHECK (col1>=10))ENGINE=Columnstore;
@ -21,7 +21,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
  `col1` int(11) DEFAULT NULL,
  CONSTRAINT `CONSTRAINT_1` CHECK (`col1` >= 10)
-) ENGINE=Columnstore DEFAULT CHARSET=latin1
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 CREATE TABLE t4(col1 INT PRIMARY KEY AUTO_INCREMENT)ENGINE=Columnstore;
 ERROR 42000: Too many keys specified; max 0 keys allowed
 CREATE TABLE t4(col1 INT )MAX_ROWS=10, ENGINE=Columnstore;
--- a/mysql-test/columnstore/basic/t/mcol_2000.test
+++ b/mysql-test/columnstore/basic/t/mcol_2000.test
@ -137,7 +137,6 @@ insert ignore into cs3 values ('12', '2020-10-25 01:02:06',
                               '1234567890', '2020-10-25 01:02:07',
                               'abc', '2020-10-25 01:02:08',
                               'cde', '2020-10-25 01:02:09');
--error 1366
 insert into cs3 values (_utf8mb4 0xE1B482, '2020-10-25 01:02:07',
                        '1234567890', '2020-10-25 01:02:08',
                        'abc', '2020-10-25 01:02:09',
--- a/mysql-test/columnstore/basic/t/mcs87_alter_column.test
+++ b/mysql-test/columnstore/basic/t/mcs87_alter_column.test
@ -11,7 +11,7 @@ DROP DATABASE IF EXISTS mcs87_db;
 CREATE DATABASE mcs87_db;
 USE mcs87_db;

-CREATE TABLE t1 (c1 INT, c2 CHAR(1)) ENGINE=Columnstore;
+CREATE TABLE t1 (c1 INT, c2 CHAR(1)) ENGINE=Columnstore CHARSET=latin1 COLLATE=latin1_swedish_ci;
 INSERT INTO t1 VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e');

 #################
--- 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 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 delete from `test023_cs3`.`cs3` where i = 1;
 update `test023_cs3`.`cs3` set i = 5 where i = 10;
 select * from `test023_cs3`.`cs3`;
--- a/mysql-test/columnstore/devregression/r/mcs7635_q212.result
+++ b/mysql-test/columnstore/devregression/r/mcs7635_q212.result
@ -18,7 +18,7 @@ Table	Create Table
 cs3	CREATE TABLE "cs3" (
  "i" int(11) DEFAULT NULL,
  "t" text DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 delete from "test023_cs3"."cs3" where i = 1;
 update "test023_cs3"."cs3" set i = 5 where i = 10;
 select * from "test023_cs3"."cs3";
--- a/mysql-test/columnstore/devregression/r/mcs7636_q213.result
+++ b/mysql-test/columnstore/devregression/r/mcs7636_q213.result
@ -19,7 +19,7 @@ Table	Create Table
 cs3	CREATE TABLE `cs3` (
  `i` int(11) DEFAULT NULL,
  `t` text DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 delete from `test023_cs3`.`cs3` where i = 1;
 update `test023_cs3`.`cs3` set i = 5 where i = 10;
 select * from `test023_cs3`.`cs3`;
@ -35,7 +35,7 @@ cs3	CREATE TABLE `cs3` (
  `i` int(11) DEFAULT NULL,
  `t` text DEFAULT NULL,
  `nt` text DEFAULT NULL
-) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 drop table `test023_cs3`.`cs3`;
 show create table `test023_cs3`.`cs3`;
 ERROR 42S02: Table 'test023_cs3.cs3' doesn't exist
--- a/mysql-test/columnstore/include/have_columnstore.inc
+++ b/mysql-test/columnstore/include/have_columnstore.inc
@ -4,7 +4,3 @@ if ($notcolumnstore == 1)
 {
  --skip Test requires engine ColumnStore.
 }
-
--disable_query_log
-set global character_set_server='latin1';
--enable_query_log
--- a/mysql-test/columnstore/setup/regression_env_setup.test
+++ b/mysql-test/columnstore/setup/regression_env_setup.test
@ -70,8 +70,6 @@ USE outerjoin;
 --exec if test -f /etc/my.cnf.d/server.cnf; then sed -i 's/\[mysqld\]/\[mysqld\]\nlower_case_table_names=1/g' /etc/my.cnf.d/server.cnf; fi
 --exec if test -f etc/mysql/mariadb.conf.d/50.server.cnf; then sed -i 's/\[mysqld\]/\[mysqld\]\nlower_case_table_names=1/g' /etc/mysql/mariadb.conf.d/50-server.cnf; fi
 #
-SET GLOBAL columnstore_use_import_for_batchinsert=ON;
-#
 --exec systemctl restart mariadb
 --exec sleep 10