diff --git a/mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result index 56ee98be2..5adcf6957 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result +++ b/mysql-test/columnstore/csinternal/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/csinternal/devregression/r/mcs7632_q112.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7632_q112.result index ede265f11..60de7c115 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7632_q112.result +++ b/mysql-test/columnstore/csinternal/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/csinternal/devregression/r/mcs7633_q113.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7633_q113.result index c5849a1a2..7748eb9c9 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7633_q113.result +++ b/mysql-test/columnstore/csinternal/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/csinternal/devregression/r/mcs7634_q211.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7634_q211.result index 17d3b0c7d..ed68e2257 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7634_q211.result +++ b/mysql-test/columnstore/csinternal/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=utf8mb3 +) 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`; diff --git a/mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result index 32b1a54d2..f4a145143 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result +++ b/mysql-test/columnstore/csinternal/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=utf8mb3 +) 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"; diff --git a/mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result index 582474d8f..4bd46f8fa 100644 --- a/mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result +++ b/mysql-test/columnstore/csinternal/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=utf8mb3 +) 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`; @@ -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=utf8mb3 +) 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