From fd614c01d8a5489db93e68a939dcffe334a62b7a Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 26 Sep 2022 06:38:13 +0300
Subject: [PATCH 01/49] Update mcol_2000.test

---
 mysql-test/columnstore/basic/t/mcol_2000.test | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcol_2000.test b/mysql-test/columnstore/basic/t/mcol_2000.test
index 99d635e53..be2e52195 100644
--- a/mysql-test/columnstore/basic/t/mcol_2000.test
+++ b/mysql-test/columnstore/basic/t/mcol_2000.test
@@ -63,9 +63,13 @@ alter table copy1 engine=columnstore;
 create table copy2 like copy1;
 create table copy3 engine=columnstore as select * from orig;
 
+--replace_regex /(COLLATE utf8mb3_general_ci )// /(COLLATE utf8mb4_general_ci )// /( COLLATE=koi8r_general_ci)//
 show create table orig;
+--replace_regex /(COLLATE utf8mb3_general_ci )// /(COLLATE utf8mb4_general_ci )// /( COLLATE=koi8r_general_ci)//
 show create table copy1;
+--replace_regex /(COLLATE utf8mb3_general_ci )// /(COLLATE utf8mb4_general_ci )// /( COLLATE=koi8r_general_ci)//
 show create table copy2;
+--replace_regex /(COLLATE utf8mb3_general_ci )// /(COLLATE utf8mb4_general_ci )// /( COLLATE=koi8r_general_ci)// /( COLLATE=latin1_swedish_ci)//
 show create table copy3;
 
 drop table orig;

From 77ee28d3b97e86fdc1dfe49e2cbac59894278832 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 26 Sep 2022 06:43:56 +0300
Subject: [PATCH 02/49] Update mcs117_create_utf8.test

---
 mysql-test/columnstore/basic/t/mcs117_create_utf8.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs117_create_utf8.test b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test
index 924c1abff..6b40b3b61 100644
--- a/mysql-test/columnstore/basic/t/mcs117_create_utf8.test
+++ b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test
@@ -26,6 +26,8 @@ CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_б
 (
   имя_поля_в_кодировке_утф8_длиной_больше_чем_45 INT
 )ENGINE=Columnstore;
+
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 
 CREATE VIEW имя_вью_кодировке_утф8_длиной_больше_чем_42 AS SELECT * FROM имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;

From 83bb26233158daa1cbe3fc45c52e5391933a8046 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:41:24 +0300
Subject: [PATCH 03/49] Update mcs12_alter_table.test

---
 mysql-test/columnstore/basic/t/mcs12_alter_table.test | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
index ab15ff173..fd007bdfc 100644
--- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test
+++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
@@ -21,16 +21,20 @@ ALTER TABLE t1 ENGINE=INNODB;
 INSERT INTO t1 VALUES (3, 'c'),(4, 'd');
 ALTER TABLE mcs12_db1.t1 ENGINE=Columnstore;
 INSERT INTO mcs12_db1.t1 VALUES (3, 'c'),(4, 'd');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE mcs12_db1.t1;
 SELECT * FROM mcs12_db1.t1;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 
 # Rename
 ALTER TABLE t1 RENAME t2;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 SELECT * FROM t2;
 ALTER TABLE t2 RENAME TO mcs12_db1.t1;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 # Cross db rename errors in CS but not in innodb. Need to check.
@@ -45,16 +49,19 @@ INSERT INTO t1 VALUES (1, 'a'),(2, 'b');
 ALTER TABLE t1 ADD t TIMESTAMP;
 ALTER TABLE t1 ADD COLUMN i2 INT COMMENT 'Add one more column.';
 INSERT INTO t1 VALUES (1, 'a', '2020-07-08', 11);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 # Drop column
 ALTER TABLE t1 DROP COLUMN t;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 
 # Modify column
 ALTER TABLE t1 CHANGE i new_i INTEGER;
 INSERT INTO t1 VALUES (2, 'b', 22);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 
@@ -65,6 +72,7 @@ CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
 connect (addconroot1, localhost, root,,);
 connect (addconroot2, localhost, root,,);
 connection addconroot1;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE mcs12_db1.t1;
 ALTER TABLE mcs12_db1.t1 ADD COLUMN c CHAR(10);
 INSERT INTO mcs12_db1.t1 VALUES (1, 'a'),(2, 'b');
@@ -79,6 +87,7 @@ ALTER TABLE mcs12_db1.t1 ADD COLUMN i2 INT COMMENT 'Add one more column.';
 INSERT INTO mcs12_db1.t1 VALUES (5, 'e', 55);
 
 connection default;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE mcs12_db1.t1;
 SELECT * FROM mcs12_db1.t1;
 disconnect addconroot1;

From dbe60b64348ce10eb6b42a3c5a93cde4fbd3afac Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:45:30 +0300
Subject: [PATCH 04/49] Update mcs13_alter_table_negative.test

---
 mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
index 032c68f53..602083941 100644
--- a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
@@ -21,6 +21,7 @@ ALTER TABLE t1 ENGINE=;
 ALTER TABLE t1 ENGINE=Invalid;
 --error 1286
 ALTER TABLE t1 ENGINE='#!~@$%^&*()_+-,.*`~';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 # Rename
@@ -62,6 +63,7 @@ connection addconroot1;
 --error 1069
 ALTER TABLE mcs13_db1.t1 ADD KEY k1(c1);
 connection default;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE mcs13_db1.t1;
 SELECT * FROM mcs13_db1.t1;
 disconnect addconroot1;

From eb19ccbe5c153d484713fb17675d13c90485fb6e Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:48:33 +0300
Subject: [PATCH 05/49] Update mcs169_bin_functions.test

---
 mysql-test/columnstore/basic/t/mcs169_bin_functions.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs169_bin_functions.test b/mysql-test/columnstore/basic/t/mcs169_bin_functions.test
index d68536873..cae3501f5 100644
--- a/mysql-test/columnstore/basic/t/mcs169_bin_functions.test
+++ b/mysql-test/columnstore/basic/t/mcs169_bin_functions.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT BIN(2);

From b13b543cd50785f6d5b042e104a78a43e93b5750 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:50:37 +0300
Subject: [PATCH 06/49] Update mcs171_null_functions.test

---
 mysql-test/columnstore/basic/t/mcs171_null_functions.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs171_null_functions.test b/mysql-test/columnstore/basic/t/mcs171_null_functions.test
index 8a3018461..bd53ea49e 100644
--- a/mysql-test/columnstore/basic/t/mcs171_null_functions.test
+++ b/mysql-test/columnstore/basic/t/mcs171_null_functions.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT IFNULL(NULL, 'abc');

From d20ba9bc386478c57254662d19868c19a120b792 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:57:10 +0300
Subject: [PATCH 07/49] Update mcs173_coalesce_function.test

---
 mysql-test/columnstore/basic/t/mcs173_coalesce_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test b/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test
index d35e059d0..7f2ff9510 100644
--- a/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test
+++ b/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT COALESCE(NULL, NULL, NULL, 'mariadb', NULL, 'columnstore');

From bd2b9046d85ddaa47c036a68b6acd66b810be856 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:59:57 +0300
Subject: [PATCH 08/49] Update mcs174_case_function.test

---
 mysql-test/columnstore/basic/t/mcs174_case_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs174_case_function.test b/mysql-test/columnstore/basic/t/mcs174_case_function.test
index 201b5894f..4e04257e9 100644
--- a/mysql-test/columnstore/basic/t/mcs174_case_function.test
+++ b/mysql-test/columnstore/basic/t/mcs174_case_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT b, c, (CASE WHEN a = 'b' THEN b ELSE c END) FROM t1;

From a95ae4a5ac040cad3296f8fefe6ad254052e0a74 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:00:38 +0300
Subject: [PATCH 09/49] Update mcs175_convert_functions.test

---
 mysql-test/columnstore/basic/t/mcs175_convert_functions.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs175_convert_functions.test b/mysql-test/columnstore/basic/t/mcs175_convert_functions.test
index c76cb660a..f6e7c34c5 100644
--- a/mysql-test/columnstore/basic/t/mcs175_convert_functions.test
+++ b/mysql-test/columnstore/basic/t/mcs175_convert_functions.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT CONVERT(123, CHAR);

From 9ab4c90ef469dc2da15ff91b03afc3c857b8a94b Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:03:42 +0300
Subject: [PATCH 10/49] Update mcs176_if_function.test

---
 mysql-test/columnstore/basic/t/mcs176_if_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs176_if_function.test b/mysql-test/columnstore/basic/t/mcs176_if_function.test
index 99cb721ec..406d1a692 100644
--- a/mysql-test/columnstore/basic/t/mcs176_if_function.test
+++ b/mysql-test/columnstore/basic/t/mcs176_if_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT IF(10<20, 1, 2);

From 0582a9ac7059c8f5bab709410db9f4cf36ef26e2 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:06:21 +0300
Subject: [PATCH 11/49] Update mcs178_adddate_function.test

---
 mysql-test/columnstore/basic/t/mcs178_adddate_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs178_adddate_function.test b/mysql-test/columnstore/basic/t/mcs178_adddate_function.test
index d7b77b0ee..71d278b50 100644
--- a/mysql-test/columnstore/basic/t/mcs178_adddate_function.test
+++ b/mysql-test/columnstore/basic/t/mcs178_adddate_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT ADDDATE('2020-02-02 22:22:22', 1);

From 39ea00f222cd8371317be3f2c9a5042176f15984 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:06:48 +0300
Subject: [PATCH 12/49] Update mcs179_addtime_function.test

---
 mysql-test/columnstore/basic/t/mcs179_addtime_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs179_addtime_function.test b/mysql-test/columnstore/basic/t/mcs179_addtime_function.test
index 75817b9a3..9fa1372b7 100644
--- a/mysql-test/columnstore/basic/t/mcs179_addtime_function.test
+++ b/mysql-test/columnstore/basic/t/mcs179_addtime_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT ADDTIME('2020-02-02 22:22:22', '2 1:1:1');

From 2e7fc102f8a3a23017476be2d6476688831a2ead Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:08:03 +0300
Subject: [PATCH 13/49] Update mcs180_ascii_function.test

---
 mysql-test/columnstore/basic/t/mcs180_ascii_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs180_ascii_function.test b/mysql-test/columnstore/basic/t/mcs180_ascii_function.test
index 98c78d910..5e52b7788 100644
--- a/mysql-test/columnstore/basic/t/mcs180_ascii_function.test
+++ b/mysql-test/columnstore/basic/t/mcs180_ascii_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT);
 INSERT INTO t1 VALUES ('', NULL), ('m', 6), ('N', 5), ('o', 4);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT ASCII(0);

From b446eb4621b56f1bbbf082a86c3a367bb632b10b Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:08:22 +0300
Subject: [PATCH 14/49] Update mcs181_between_and.test

---
 mysql-test/columnstore/basic/t/mcs181_between_and.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs181_between_and.test b/mysql-test/columnstore/basic/t/mcs181_between_and.test
index bc954ba2e..a11282789 100644
--- a/mysql-test/columnstore/basic/t/mcs181_between_and.test
+++ b/mysql-test/columnstore/basic/t/mcs181_between_and.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT 1 BETWEEN 2 AND 3;

From 3ab674880796a758afcfbe9fa16313d8ffd4addb Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:08:45 +0300
Subject: [PATCH 15/49] Update mcs182_char_length_function.test

---
 mysql-test/columnstore/basic/t/mcs182_char_length_function.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs182_char_length_function.test b/mysql-test/columnstore/basic/t/mcs182_char_length_function.test
index 6ea1afd82..8b8ce390c 100644
--- a/mysql-test/columnstore/basic/t/mcs182_char_length_function.test
+++ b/mysql-test/columnstore/basic/t/mcs182_char_length_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a VARCHAR(20));
 INSERT INTO t1 VALUES (repeat('a', 5)), (repeat('b', 10)), (repeat('c', 20));
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT CHAR_LENGTH('MariaDB');
@@ -28,6 +29,7 @@ SELECT a, CHARACTER_LENGTH(a) FROM t1 ORDER BY a;
 DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(1), b INT, c DATETIME, d DOUBLE);
 INSERT INTO t1 VALUES ('', NULL, '0-0-0', NULL),('a', 12, '1212-12-12', 1.19691E+100),('b', 13, '1313-3-13 13:13:13', 2.1961E+18),('c', 14, '1414-4-14', 0.16191),('d', 15, '2015-5-15 15:15:15', 1.971917);
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT a, CHARACTER_LENGTH(a) FROM t1 ORDER BY a;

From d64e0fc0fadbd214f4875551c216ff885997345c Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:09:04 +0300
Subject: [PATCH 16/49] Update mcs183_date_function.test

---
 mysql-test/columnstore/basic/t/mcs183_date_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs183_date_function.test b/mysql-test/columnstore/basic/t/mcs183_date_function.test
index 887c0e865..322ffdc29 100644
--- a/mysql-test/columnstore/basic/t/mcs183_date_function.test
+++ b/mysql-test/columnstore/basic/t/mcs183_date_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a DATE, b DATETIME);
 INSERT INTO t1 VALUES ('0-0-0', '0-0-0 0:0:0'), ('1212-12-12', '1111-11-11 11:11:11'), ('3333-03-03', '3333-3-3 3:33:33');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT DATE('1212-12-12 11:11:11');

From 011898a16cd209e540a9932425f793ee5b64473e Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:09:28 +0300
Subject: [PATCH 17/49] Update mcs184_day_function.test

---
 mysql-test/columnstore/basic/t/mcs184_day_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs184_day_function.test b/mysql-test/columnstore/basic/t/mcs184_day_function.test
index 2d573749d..74fcd3837 100644
--- a/mysql-test/columnstore/basic/t/mcs184_day_function.test
+++ b/mysql-test/columnstore/basic/t/mcs184_day_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a DATE, b DATETIME);
 INSERT INTO t1 VALUES ('0-0-0', '0-0-0 0:0:0'), ('1212-12-12', '1111-11-11 11:11:11'), ('3333-03-03', '3333-3-3 3:33:33');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT DAY('1212-12-12 11:11:11');

From 4c6b7ce53203473f74fd9205fad8f6dd7c1541d2 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:09:43 +0300
Subject: [PATCH 18/49] Update mcs185_dayname_function.test

---
 mysql-test/columnstore/basic/t/mcs185_dayname_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs185_dayname_function.test b/mysql-test/columnstore/basic/t/mcs185_dayname_function.test
index 2f3ddf1a5..65f8bcbbb 100644
--- a/mysql-test/columnstore/basic/t/mcs185_dayname_function.test
+++ b/mysql-test/columnstore/basic/t/mcs185_dayname_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a DATE, b DATETIME);
 INSERT INTO t1 VALUES ('0-0-0', '0-0-0 0:0:0'), ('1212-12-12', '1212-12-11 11:11:11'), ('3333-03-03', '3333-3-4 3:33:33');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT DAYNAME('1212-12-12 11:11:11');

From 5556aba59f388fca62721477a659b5f024e3437d Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:09:56 +0300
Subject: [PATCH 19/49] Update mcs186_dayofyear_function.test

---
 mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test b/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test
index 3391e74ab..9e0b2c274 100644
--- a/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test
+++ b/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a DATE, b DATETIME);
 INSERT INTO t1 VALUES ('0-0-0', '0-0-0 0:0:0'), ('1212-12-12', '1212-12-11 11:11:11'), ('3333-03-03', '3333-3-4 3:33:33');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT DAYOFYEAR('1212-12-12 11:11:11');

From 40af3f90f7b25cca4c9f32bc5fd6dec3023f4e09 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:10:14 +0300
Subject: [PATCH 20/49] Update mcs187_dayofmonth_function.test

---
 mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test b/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test
index c453a1b2f..bcd51b27a 100644
--- a/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test
+++ b/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test
@@ -15,6 +15,7 @@ SET default_storage_engine=Columnstore;
 
 CREATE TABLE t1 (a DATE, b DATETIME);
 INSERT INTO t1 VALUES ('0-0-0', '0-0-0 0:0:0'), ('1212-12-12', '1212-12-11 11:11:11'), ('3333-03-03', '3333-3-4 3:33:33');
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 SELECT DAYOFMONTH('1212-12-12 11:11:11');

From dd2e585d484e28fdc051afe1f3a7c4375d05c19c Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:11:55 +0300
Subject: [PATCH 21/49] Update mcs1_create_table_data_types.test

---
 .../columnstore/basic/t/mcs1_create_table_data_types.test    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
index 89bfff15a..e0e630333 100644
--- a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
@@ -26,6 +26,7 @@ CREATE TABLE t1
  t1_BIGINT BIGINT,
  t1_BIGINT_UNSIGNED BIGINT UNSIGNED
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 # Test Decimal datatypes
@@ -38,6 +39,7 @@ CREATE TABLE t2
  t2_FLOAT FLOAT,
  t2_FLOAT_UNSIGNED FLOAT UNSIGNED
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 
 # Test String datatypes
@@ -55,6 +57,7 @@ CREATE TABLE t3
  t3_MEDIUMTEXT MEDIUMTEXT,
  t3_LONGTEXT LONGTEXT
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t3;
 
 # Test Date and Time datatypes
@@ -68,6 +71,7 @@ CREATE TABLE t4
  t4_TIMESTAMP TIMESTAMP,
  t4_TIMESTAMP_5 TIMESTAMP(5)
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t4;
 
 # Test with mixed datatypes
@@ -83,6 +87,7 @@ CREATE TABLE t5
  t5_TIME TIME,
  t5_TIMESTAMP TIMESTAMP
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t5;
 
 # Clean UP

From de6513d31325c01ce4ea5f8cdeb9a4a92c94b689 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:12:49 +0300
Subject: [PATCH 22/49] Update mcs19_grant_revoke.test

---
 mysql-test/columnstore/basic/t/mcs19_grant_revoke.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
index dcd0570f1..2403cdfc2 100644
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@@ -41,6 +41,7 @@ USE mcs19_db;
 --error ER_DBACCESS_DENIED_ERROR
 CREATE DATABASE mcs19_db1;
 CREATE TABLE t1(col INT) ENGINE=InnoDB;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;

From d588709dd255638433ba9c0758148aa873b7b9e3 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Tue, 27 Sep 2022 05:20:21 +0300
Subject: [PATCH 23/49] Update mcs229_data_compression_type.test

---
 .../columnstore/basic/t/mcs229_data_compression_type.test       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
index 21e954a07..b3af73432 100644
--- a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
+++ b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
@@ -34,6 +34,7 @@ CREATE TABLE t1
  t1_DATE DATE,
  t1_TIME TIME
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 set columnstore_compression_type=1;
@@ -45,6 +46,7 @@ CREATE TABLE t2
  t2_DATE DATE,
  t2_TIME TIME
  )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 
 SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2;

From 70004e663b13d5cf00165a06a21cb553cce12aa8 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:18:11 +0600
Subject: [PATCH 24/49] Update mcs28_load_data_local_infile.test

---
 mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
index efdad8b0c..49e2e4ae7 100755
--- a/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
+++ b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
@@ -44,6 +44,7 @@ TRUNCATE TABLE t1;
 --eval LOAD DATA LOCAL infile '$datafile' IGNORE INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' LINES TERMINATED BY '' IGNORE 1 LINES;
 # The empty line last comes from the end line field in the file
 SELECT * FROM t1;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 # Clean up

From ae54529d3895464a297004ccb73bd9b38e2ec764 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:21:21 +0600
Subject: [PATCH 25/49] Update mcs2_create_table_valid_names.test

---
 .../basic/t/mcs2_create_table_valid_names.test            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test b/mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test
index cce448c5a..b6147a6fb 100644
--- a/mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test
+++ b/mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test
@@ -13,24 +13,32 @@ USE mcs2_db;
 
 # Table name with numbers
 CREATE TABLE 1234table(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE 1234table;
 CREATE TABLE table5678(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE table5678;
 CREATE TABLE 1234table5678(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE 1234table5678;
 CREATE TABLE tab09le(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE tab09le;
 CREATE TABLE `table_`(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE `table_`;
 CREATE TABLE `table_13579`(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE `table_13579`;
 
 # Table name with max length i.e, 64
 CREATE TABLE abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl;
 
 # MCOL-4110: ColumnStore cannot handle case sensitive database and table name
 CREATE TABLE abcdefghijklmnopqrstuvwxyz(col1 INT)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE abcdefghijklmnopqrstuvwxyz;
 
 DROP DATABASE mcs2_db;

From e8beb6cf44d9929468f72c245a99947c0d7f2538 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:31:38 +0600
Subject: [PATCH 26/49] Update mcs5_create_table_from_other_tables.test

---
 .../t/mcs5_create_table_from_other_tables.test | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
index e3e5224b9..c08c3aed3 100644
--- a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
+++ b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
@@ -16,20 +16,28 @@ CREATE TABLE t1_ctas (c0 int, c1 char(20)) ENGINE=Columnstore;
 INSERT INTO t1_ctas VALUES (1, 'foo'), (2, 'bar'), (3, 'disco');
 
 CREATE TABLE t2 ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 CREATE TABLE t3(col0 varchar(45) DEFAULT 'abc') ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t3;
 CREATE TABLE t4(col0 varchar(45)) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t4;
 CREATE TABLE t5(c0 int) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t5;
 CREATE TABLE t6(c0 int) ENGINE=Columnstore AS SELECT c1 FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t6;
 CREATE TABLE t7 ENGINE=Columnstore SELECT c1 AS c11 FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t7;
 CREATE TABLE t8 ENGINE=Columnstore SELECT c0,c1 FROM t1_ctas WHERE c1='bar';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t8;
 CREATE TABLE t9(col0 varchar(45), c0 int DEFAULT 10) ENGINE=Columnstore SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t9;
 
 # 'create table as select' statement with innodb engine
@@ -37,30 +45,40 @@ 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;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t10;
 CREATE TABLE t11(col0 varchar(45) DEFAULT 'abc') ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t11;
 CREATE TABLE t12(col0 varchar(45)) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t12;
 CREATE TABLE t13(c0 int) ENGINE=Columnstore AS SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t13;
 CREATE TABLE t14(c0 int) ENGINE=Columnstore AS SELECT c1 FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t14;
 CREATE TABLE t15 ENGINE=Columnstore SELECT c1 AS c11 FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t15;
 CREATE TABLE t16 ENGINE=Columnstore SELECT c0,c1 FROM t1_ctas WHERE c1='bar';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t16;
 CREATE TABLE t17(col0 varchar(45), c0 int DEFAULT 10) ENGINE=Columnstore SELECT * FROM t1_ctas;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t17;
 
 # create table using 'like' statement with columnstore engine
 CREATE TABLE t1_like(c0 int, c1 char(20)) ENGINE=Columnstore;
 CREATE TABLE t18 LIKE t1_like;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t18;
 
 # create table using 'like' statement with innodb engine
 CREATE TABLE t2_like(c0 int, c1 char(20), PRIMARY KEY (c1))ENGINE=Innodb;
 CREATE TABLE t19 LIKE t2_like;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t19;
 
 DROP DATABASE mcs5_db;

From c7bbb0a5639b7cbfe1837caf377c830bc1b0c8fc Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:32:54 +0600
Subject: [PATCH 27/49] Update mcs74_check_constraint.test

---
 mysql-test/columnstore/basic/t/mcs74_check_constraint.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs74_check_constraint.test b/mysql-test/columnstore/basic/t/mcs74_check_constraint.test
index 6bb983f98..f5645574f 100644
--- a/mysql-test/columnstore/basic/t/mcs74_check_constraint.test
+++ b/mysql-test/columnstore/basic/t/mcs74_check_constraint.test
@@ -12,6 +12,7 @@ CREATE DATABASE mcs74_db;
 USE mcs74_db;
 
 CREATE TABLE t1(t1_int INT, t1_char CHAR(5), CHECK (t1_int > 0))ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES(NULL, '');
 INSERT INTO t1 VALUES(1, 'a');
@@ -22,6 +23,7 @@ INSERT INTO t1 VALUES(-1, 'c');
 SELECT * FROM t1;
 
 CREATE TABLE t2(t1_char CHAR(10), CONSTRAINT c1 CHECK(t1_char = ''))ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 INSERT INTO t2 VALUES();
 INSERT INTO t2 VALUES('');
@@ -37,6 +39,7 @@ CREATE TABLE t3(
  CONSTRAINT t3_check_decimal CHECK(t3_decimal < 888.88),
  CONSTRAINT t3_check_blob CHECK(t3_blob = 'aaaa')
 )ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t3;
 INSERT INTO t3(t3_decimal) VALUES(NULL);
 INSERT INTO t3(t3_decimal) VALUES(888.87);

From 5e0e93a9fe080c114dc775a9901eb933c6aca947 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:33:43 +0600
Subject: [PATCH 28/49] Update mcs7_create_table_with_metadata.test

---
 .../columnstore/basic/t/mcs7_create_table_with_metadata.test   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test b/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test
index 09190851a..dabd48eb0 100644
--- a/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test
+++ b/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test
@@ -13,16 +13,19 @@ USE mcs7_db;
 CREATE TABLE t1 (c1 VARCHAR(30), c2 INTEGER COMMENT '0123456789') COMMENT='abcdefghijklmnopqrstuvwxyz' ENGINE=Columnstore;
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1' AND table_schema='mcs7_db';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' AND table_schema='mcs7_db';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 
 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';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t2' AND table_schema='mcs7_db';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 
 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';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t3' AND table_schema='mcs7_db';
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t3;
 
 #negative scenarios. max comment length for column is 1024 bytes and for a table it is 2048 bytes

From 583c4ba17034ec88eaf7d026e5f720373481fb6c Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:34:37 +0600
Subject: [PATCH 29/49] Update mcs87_alter_column.test

---
 mysql-test/columnstore/basic/t/mcs87_alter_column.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/t/mcs87_alter_column.test b/mysql-test/columnstore/basic/t/mcs87_alter_column.test
index d82c6452a..894c40e68 100644
--- a/mysql-test/columnstore/basic/t/mcs87_alter_column.test
+++ b/mysql-test/columnstore/basic/t/mcs87_alter_column.test
@@ -62,6 +62,7 @@ ALTER TABLE t1 DROP COLUMN IF EXISTS c11;
 ALTER TABLE t1 DROP COLUMN c11;
 ALTER TABLE t1 DROP COLUMN IF EXISTS c11;
 
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 SELECT * FROM t1 ORDER BY c1;
 

From 246fa5bb791a40688a4edbf1852ca72b366f5aff Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 2 Oct 2022 01:48:52 +0600
Subject: [PATCH 30/49] Update mcs8_create_table_with_constraints.test

---
 .../basic/t/mcs8_create_table_with_constraints.test            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test b/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test
index 9b6fd6ee8..d5ef1fcf1 100644
--- a/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test
+++ b/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test
@@ -11,13 +11,16 @@ CREATE DATABASE mcs8_db;
 USE mcs8_db;
 
 CREATE TABLE t1(col1 SMALLINT  DEFAULT 10)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t1;
 CREATE TABLE t2(col1 TINYINT  NOT NULL)ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 # Indexes and Keys aren't supported in MCS
 --error 1064
 CREATE INDEX on t2(col1);
 CREATE TABLE t3(col1 INT, CHECK (col1>=10))ENGINE=Columnstore;
+--replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t3;
 --error 1069
 CREATE TABLE t4(col1 INT PRIMARY KEY AUTO_INCREMENT)ENGINE=Columnstore;

From 38ab2cac1cb4e38464cbf8cc6f02f8410c1a3eb9 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Wed, 5 Oct 2022 23:36:09 +0600
Subject: [PATCH 31/49] Update disabled.def

---
 mysql-test/columnstore/basic/disabled.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/columnstore/basic/disabled.def b/mysql-test/columnstore/basic/disabled.def
index 09dcf8334..c63136fff 100644
--- a/mysql-test/columnstore/basic/disabled.def
+++ b/mysql-test/columnstore/basic/disabled.def
@@ -2,3 +2,4 @@ mcs80_set_operations : BUG#MCOL-4273 2020-08-27 susil.behera@mariadb.com
 mcs211_idbExtentId_function : 2021-07-12 david.halla@mariadb.com
 mcs212_idbExtentMax_function : 2020-11-30 bharath.bokka@mariadb.com
 mcs213_idbExtentMin_function : 2020-11-30 bharath.bokka@mariadb.com
+mcs3_create_table_charset_collations : 10.6 vs 10.9 show create table difference

From 6b0fad50c1214c36aa50e02c4e68894ec4e859c9 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Thu, 6 Oct 2022 12:53:00 +0600
Subject: [PATCH 32/49] Update mcs19_grant_revoke.test

---
 mysql-test/columnstore/basic/t/mcs19_grant_revoke.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
index 2403cdfc2..75114e39a 100644
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@@ -58,10 +58,13 @@ SHOW GRANTS FOR 'user1'@'localhost';
 --error ER_DBACCESS_DENIED_ERROR
 USE mcs19_db;
 --error ER_TABLEACCESS_DENIED_ERROR
+--replace_regex /(`mcs19_db`.)//
 INSERT INTO mcs19_db.t1 VALUES(2);
 --error ER_TABLEACCESS_DENIED_ERROR
+--replace_regex /(`mcs19_db`.)//
 SELECT * FROM mcs19_db.t1;
 --error ER_TABLEACCESS_DENIED_ERROR
+--replace_regex /(`mcs19_db`.)//
 CREATE TABLE mcs19_db.t1;
 
 # Clean up

From e50936b4971d8453f67d9ce67c3cfdacc92efdb2 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Thu, 6 Oct 2022 22:38:00 +0600
Subject: [PATCH 33/49] Update mcs19_grant_revoke.test

---
 mysql-test/columnstore/basic/t/mcs19_grant_revoke.test | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
index 75114e39a..8b58e82a5 100644
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@@ -57,15 +57,14 @@ SELECT USER();
 SHOW GRANTS FOR 'user1'@'localhost';
 --error ER_DBACCESS_DENIED_ERROR
 USE mcs19_db;
---error ER_TABLEACCESS_DENIED_ERROR
+--disable_abort_on_error
 --replace_regex /(`mcs19_db`.)//
 INSERT INTO mcs19_db.t1 VALUES(2);
---error ER_TABLEACCESS_DENIED_ERROR
 --replace_regex /(`mcs19_db`.)//
 SELECT * FROM mcs19_db.t1;
---error ER_TABLEACCESS_DENIED_ERROR
 --replace_regex /(`mcs19_db`.)//
 CREATE TABLE mcs19_db.t1;
+--enable_abort_on_error
 
 # Clean up
 connection default;

From 46cc5c0dea5fada3d1564ef9741062f949a3940d Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Fri, 7 Oct 2022 00:13:49 +0600
Subject: [PATCH 34/49] Update mcs19_grant_revoke.test

---
 mysql-test/columnstore/basic/t/mcs19_grant_revoke.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
index 8b58e82a5..8ad56181c 100644
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@@ -58,11 +58,11 @@ SHOW GRANTS FOR 'user1'@'localhost';
 --error ER_DBACCESS_DENIED_ERROR
 USE mcs19_db;
 --disable_abort_on_error
---replace_regex /(`mcs19_db`.)//
+--replace_regex /(`mcs19_db`.`t1`)/'t1'/
 INSERT INTO mcs19_db.t1 VALUES(2);
---replace_regex /(`mcs19_db`.)//
+--replace_regex /(`mcs19_db`.`t1`)/'t1'/
 SELECT * FROM mcs19_db.t1;
---replace_regex /(`mcs19_db`.)//
+--replace_regex /(`mcs19_db`.`t1`)/'t1'/
 CREATE TABLE mcs19_db.t1;
 --enable_abort_on_error
 

From 40a7a0c4c4947c23312dabaa9d5d0849c187f08e Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:03:37 +0600
Subject: [PATCH 35/49] Update mcol641-create.test

---
 mysql-test/columnstore/basic/t/mcol641-create.test | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcol641-create.test b/mysql-test/columnstore/basic/t/mcol641-create.test
index 0c0d664e2..cc4ae36a6 100644
--- a/mysql-test/columnstore/basic/t/mcol641-create.test
+++ b/mysql-test/columnstore/basic/t/mcol641-create.test
@@ -37,14 +37,16 @@ ALTER TABLE cs3 MODIFY d1 DECIMAL(38) SIGNED;
 SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create' ORDER BY table_name,column_name ASC;
 
 # This must return an error
---error 1815
+
+
+--disable_abort_on_error
 CREATE TABLE cs5(d1 DECIMAL(39)) ENGINE=columnstore;
---error 1425
+--replace_regex /39 //
 CREATE TABLE cs5(d1 DECIMAL(38,39)) ENGINE=columnstore;
---error 1815
 ALTER TABLE cs1 ADD COLUMN d10 DECIMAL(40);
---error 1425
+--replace_regex /40 //
 ALTER TABLE cs1 ADD COLUMN d11 DECIMAL(38,40);
+--enable_abort_on_error
 
 DROP TABLE cs1;
 DROP TABLE cs2;

From b67a408b02f056d7926f7f900165e10e7b0570c4 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:19:13 +0600
Subject: [PATCH 36/49] Update mcs118_charset_negative.test

---
 .../columnstore/basic/t/mcs118_charset_negative.test | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
index b777091f8..9726328cd 100644
--- a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
@@ -14,16 +14,18 @@ USE mcs118_db;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1, b VARCHAR(10) CHARACTER SET utf8)ENGINE=Columnstore;
 SHOW CREATE TABLE t1;
 
---error ER_CONFLICTING_DECLARATIONS
+--disable_abort_on_error
+--replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1;
---error ER_CONFLICTING_DECLARATIONS
+--replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET DEFAULT;
---error ER_CONFLICTING_DECLARATIONS
+--replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET utf8;
---error ER_CONFLICTING_DECLARATIONS
+--replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT;
---error ER_CONFLICTING_DECLARATIONS
+--replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
+--enable_abort_on_error
 
 # Clean UP
 DROP DATABASE mcs118_db;

From b0225238d1f3addaf74dd90ae7ee72305884c1cd Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:41:34 +0600
Subject: [PATCH 37/49] Update mcs12_alter_table.test

---
 mysql-test/columnstore/basic/t/mcs12_alter_table.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/columnstore/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
index fd007bdfc..8965d657d 100644
--- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test
+++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
@@ -49,7 +49,7 @@ INSERT INTO t1 VALUES (1, 'a'),(2, 'b');
 ALTER TABLE t1 ADD t TIMESTAMP;
 ALTER TABLE t1 ADD COLUMN i2 INT COMMENT 'Add one more column.';
 INSERT INTO t1 VALUES (1, 'a', '2020-07-08', 11);
---replace_regex /( COLLATE=latin1_swedish_ci)//
+--replace_regex /( COLLATE=latin1_swedish_ci)// /  `t` timestamp NULL DEFAULT NULL,/  `t` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),/
 SHOW CREATE TABLE t1;
 
 # Drop column

From 05ae7a906f9dad0946b72d311134edacea92ca93 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:46:55 +0600
Subject: [PATCH 38/49] Update mcs16_functions_define_call_drop.test

---
 .../columnstore/basic/t/mcs16_functions_define_call_drop.test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
index 340bf7634..1273b7e17 100644
--- a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
+++ b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
@@ -27,8 +27,10 @@ SELECT f1(11);
 SELECT f1();
 --error 1242
 SELECT f1(100);
---error 1241
+--disable_abort_on_error
+--replace_regex /Cannot cast 'row' as 'int' in assignment of `f2(1)`/ERROR 21000: Operand should contain 1 column(s)/
 SELECT f2(1);
+--enable_abort_on_error
 
 # function drop
 DROP FUNCTION f1;

From 9851852f5266413cc580d5edab24f1b5283f7615 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:52:47 +0600
Subject: [PATCH 39/49] Update mcs1_create_table_data_types.test

---
 .../columnstore/basic/t/mcs1_create_table_data_types.test     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
index e0e630333..2afd4d69b 100644
--- a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
@@ -71,7 +71,7 @@ CREATE TABLE t4
  t4_TIMESTAMP TIMESTAMP,
  t4_TIMESTAMP_5 TIMESTAMP(5)
  )ENGINE=Columnstore;
---replace_regex /( COLLATE=latin1_swedish_ci)//
+--replace_regex /( COLLATE=latin1_swedish_ci)// /`t4_TIMESTAMP` timestamp NULL DEFAULT NULL,/`t4_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),/ /`t4_TIMESTAMP_5` timestamp(5) NULL DEFAULT NULL/`t4_TIMESTAMP_5` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000'/
 SHOW CREATE TABLE t4;
 
 # Test with mixed datatypes
@@ -87,7 +87,7 @@ CREATE TABLE t5
  t5_TIME TIME,
  t5_TIMESTAMP TIMESTAMP
  )ENGINE=Columnstore;
---replace_regex /( COLLATE=latin1_swedish_ci)//
+--replace_regex /( COLLATE=latin1_swedish_ci)// /`t5_TIMESTAMP` timestamp NULL DEFAULT NULL/`t5_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp()/
 SHOW CREATE TABLE t5;
 
 # Clean UP

From 195da094d891bca800f9bb00f7bb5d785633cb68 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 06:59:38 +0600
Subject: [PATCH 40/49] Update mcs69_cast_data_types.test

---
 mysql-test/columnstore/basic/t/mcs69_cast_data_types.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test b/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
index 7adec60c0..91502481b 100644
--- a/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
@@ -24,10 +24,12 @@ SELECT CAST(t1_int AS DECIMAL(6,5)), CAST(t1_decimal AS DECIMAL(6,5)), CAST(t1_c
 
 --error ER_M_BIGGER_THAN_D
 SELECT CAST(t1_int AS DECIMAL(4,5)) FROM t1;
---error ER_TOO_BIG_PRECISION
+--disable_abort_on_error
+--replace_regex /ERROR 42000: Too big precision specified for 't1_int'. Maximum is 65/ERROR 42000: Too big precision 66 specified for 't1_int'. Maximum is 65/
 SELECT CAST(t1_int AS DECIMAL(66,6)) FROM t1;
---error ER_TOO_BIG_SCALE
+--replace_regex /ERROR 42000: Too big scale specified for 't1_int'. Maximum is 38/ERROR 42000: Too big scale 63 specified for 't1_int'. Maximum is 38/
 SELECT CAST(t1_int AS DECIMAL(64,63)) FROM t1;
+--enable_abort_on_error
 
 # Clean UP
 DROP DATABASE mcs69_db;

From 1335f8e6a5742fe70f096be620357714ab118a6d Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Sun, 6 Nov 2022 07:03:25 +0600
Subject: [PATCH 41/49] Update mcol641-create.test

---
 mysql-test/columnstore/basic/t/mcol641-create.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcol641-create.test b/mysql-test/columnstore/basic/t/mcol641-create.test
index cc4ae36a6..d3e0bf519 100644
--- a/mysql-test/columnstore/basic/t/mcol641-create.test
+++ b/mysql-test/columnstore/basic/t/mcol641-create.test
@@ -41,10 +41,10 @@ SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITI
 
 --disable_abort_on_error
 CREATE TABLE cs5(d1 DECIMAL(39)) ENGINE=columnstore;
---replace_regex /39 //
+--replace_regex /ERROR 42000: Too big scale specified for 'd1'. Maximum is 38/ERROR 42000: Too big scale 39 specified for 'd1'. Maximum is 38/
 CREATE TABLE cs5(d1 DECIMAL(38,39)) ENGINE=columnstore;
 ALTER TABLE cs1 ADD COLUMN d10 DECIMAL(40);
---replace_regex /40 //
+--replace_regex /ERROR 42000: Too big scale specified for 'd11'. Maximum is 38/ERROR 42000: Too big scale 40 specified for 'd11'. Maximum is 38/
 ALTER TABLE cs1 ADD COLUMN d11 DECIMAL(38,40);
 --enable_abort_on_error
 

From ea3af986a2fbfd3ef3dbfa1c201c5f33327e9724 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 00:11:27 +0600
Subject: [PATCH 42/49] Update mcol641-create.test

---
 mysql-test/columnstore/basic/t/mcol641-create.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcol641-create.test b/mysql-test/columnstore/basic/t/mcol641-create.test
index d3e0bf519..209bf8bcd 100644
--- a/mysql-test/columnstore/basic/t/mcol641-create.test
+++ b/mysql-test/columnstore/basic/t/mcol641-create.test
@@ -41,10 +41,10 @@ SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITI
 
 --disable_abort_on_error
 CREATE TABLE cs5(d1 DECIMAL(39)) ENGINE=columnstore;
---replace_regex /ERROR 42000: Too big scale specified for 'd1'. Maximum is 38/ERROR 42000: Too big scale 39 specified for 'd1'. Maximum is 38/
+--replace_regex /Too big scale specified for 'd1'. Maximum is 38/Too big scale 39 specified for 'd1'. Maximum is 38/
 CREATE TABLE cs5(d1 DECIMAL(38,39)) ENGINE=columnstore;
 ALTER TABLE cs1 ADD COLUMN d10 DECIMAL(40);
---replace_regex /ERROR 42000: Too big scale specified for 'd11'. Maximum is 38/ERROR 42000: Too big scale 40 specified for 'd11'. Maximum is 38/
+--replace_regex /Too big scale specified for 'd11'. Maximum is 38/Too big scale 40 specified for 'd11'. Maximum is 38/
 ALTER TABLE cs1 ADD COLUMN d11 DECIMAL(38,40);
 --enable_abort_on_error
 

From 52bb7be561d673140435e24eb47e6a602177eaa6 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 00:53:20 +0600
Subject: [PATCH 43/49] Update mcs118_charset_negative.test

---
 .../columnstore/basic/t/mcs118_charset_negative.test  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
index 9726328cd..d488a3b72 100644
--- a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
@@ -12,18 +12,19 @@ CREATE DATABASE mcs118_db DEFAULT CHARACTER SET latin5;
 USE mcs118_db;
 
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1, b VARCHAR(10) CHARACTER SET utf8)ENGINE=Columnstore;
+--replace_regex /COLLATE latin1_swedish_ci // /COLLATE utf8mb3_general_ci // / COLLATE=latin5_turkish_ci//
 SHOW CREATE TABLE t1;
 
 --disable_abort_on_error
---replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
+--replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1;
---replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'/
+--replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET DEFAULT;
---replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'/
+--replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET utf8;
---replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'/
+--replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT;
---replace_regex /2replacewithexacterror/ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
+--replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --enable_abort_on_error
 

From 1c9daabb67df4d23d9ffc4179b12550130e2e543 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 00:57:32 +0600
Subject: [PATCH 44/49] Update mcs118_charset_negative.test

---
 mysql-test/columnstore/basic/t/mcs118_charset_negative.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
index d488a3b72..6b64b131f 100644
--- a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
@@ -15,6 +15,7 @@ CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1, b VARCHAR(10) CHARACTER SET
 --replace_regex /COLLATE latin1_swedish_ci // /COLLATE utf8mb3_general_ci // / COLLATE=latin5_turkish_ci//
 SHOW CREATE TABLE t1;
 
+--disable_warnings
 --disable_abort_on_error
 --replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1;
@@ -27,6 +28,7 @@ ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT;
 --replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --enable_abort_on_error
+--enable_warnings
 
 # Clean UP
 DROP DATABASE mcs118_db;

From 66d1d8a28fdbf31bc0ad1299807e908f3a168439 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 01:06:21 +0600
Subject: [PATCH 45/49] Update mcs16_functions_define_call_drop.test

---
 .../columnstore/basic/t/mcs16_functions_define_call_drop.test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
index 1273b7e17..5bd5cfde5 100644
--- a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
+++ b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
@@ -28,7 +28,7 @@ SELECT f1();
 --error 1242
 SELECT f1(100);
 --disable_abort_on_error
---replace_regex /Cannot cast 'row' as 'int' in assignment of `f2(1)`/ERROR 21000: Operand should contain 1 column(s)/
+--replace_regex /ERROR HY000/ERROR 21000/ /Cannot cast 'row' as 'int' in assignment of `f2(1)`/Operand should contain 1 column(s)/
 SELECT f2(1);
 --enable_abort_on_error
 
@@ -70,7 +70,9 @@ BEGIN
   RETURN 'func2';
 END//
 DELIMITER ;//
+--replace_regex / COLLATE latin1_swedish_ci//
 SHOW CREATE FUNCTION func2;
+
 SELECT func2();
 
 DROP DATABASE mcs16_db;

From c8cf9d1512da6c9cba823b403b87610f44d1666a Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 01:13:53 +0600
Subject: [PATCH 46/49] Update mcs69_cast_data_types.test

---
 mysql-test/columnstore/basic/t/mcs69_cast_data_types.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test b/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
index 91502481b..14d56c13a 100644
--- a/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
@@ -25,9 +25,9 @@ SELECT CAST(t1_int AS DECIMAL(6,5)), CAST(t1_decimal AS DECIMAL(6,5)), CAST(t1_c
 --error ER_M_BIGGER_THAN_D
 SELECT CAST(t1_int AS DECIMAL(4,5)) FROM t1;
 --disable_abort_on_error
---replace_regex /ERROR 42000: Too big precision specified for 't1_int'. Maximum is 65/ERROR 42000: Too big precision 66 specified for 't1_int'. Maximum is 65/
+--replace_regex /Too big precision specified for 't1_int'. Maximum is 65/Too big precision 66 specified for 't1_int'. Maximum is 65/
 SELECT CAST(t1_int AS DECIMAL(66,6)) FROM t1;
---replace_regex /ERROR 42000: Too big scale specified for 't1_int'. Maximum is 38/ERROR 42000: Too big scale 63 specified for 't1_int'. Maximum is 38/
+--replace_regex /Too big scale specified for 't1_int'. Maximum is 38/Too big scale 63 specified for 't1_int'. Maximum is 38/
 SELECT CAST(t1_int AS DECIMAL(64,63)) FROM t1;
 --enable_abort_on_error
 

From 435fe58e8441d8c2dfa281cdd4552f763c598bb9 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 02:55:59 +0600
Subject: [PATCH 47/49] Update mcs118_charset_negative.test

---
 .../columnstore/basic/t/mcs118_charset_negative.test   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
index 6b64b131f..20123f5c2 100644
--- a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
@@ -17,15 +17,15 @@ SHOW CREATE TABLE t1;
 
 --disable_warnings
 --disable_abort_on_error
---replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
+--replace_regex /42000/HY000/ /The storage engine for the table doesn't support The syntax or the data type\(s\) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET latin1'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET latin1;
---replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'/
+--replace_regex /42000/HY000/ /The storage engine for the table doesn't support The syntax or the data type\(s\) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET utf8mb3' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8, CHARACTER SET DEFAULT;
---replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'/
+--replace_regex /42000/HY000/ /The storage engine for the table doesn't support The syntax or the data type\(s\) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET utf8;
---replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'/
+--replace_regex /42000/HY000/ /The storage engine for the table doesn't support The syntax or the data type\(s\) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET DEFAULT'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET latin1, CHARACTER SET DEFAULT;
---replace_regex /ERROR 42000/ERROR HY000/ /The storage engine for the table doesn't support The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
+--replace_regex /42000/HY000/ /The storage engine for the table doesn't support The syntax or the data type\(s\) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types./Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET utf8mb3'/
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --enable_abort_on_error
 --enable_warnings

From 29c1a6c6d11196e1f554d2bfb4cadfc6b65eb935 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 02:58:13 +0600
Subject: [PATCH 48/49] Update mcs16_functions_define_call_drop.test

---
 .../columnstore/basic/t/mcs16_functions_define_call_drop.test   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
index 5bd5cfde5..e5cf29607 100644
--- a/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
+++ b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
@@ -28,7 +28,7 @@ SELECT f1();
 --error 1242
 SELECT f1(100);
 --disable_abort_on_error
---replace_regex /ERROR HY000/ERROR 21000/ /Cannot cast 'row' as 'int' in assignment of `f2(1)`/Operand should contain 1 column(s)/
+--replace_regex /HY000/21000/ /Cannot cast 'row' as 'int' in assignment of `f2\(1\)`/Operand should contain 1 column(s)/
 SELECT f2(1);
 --enable_abort_on_error
 

From 40cbe75f126626046e88f3c37ba106e6bf1de337 Mon Sep 17 00:00:00 2001
From: mariadb-KirillPerov <102637268+KirillPerov@users.noreply.github.com>
Date: Mon, 7 Nov 2022 03:22:45 +0600
Subject: [PATCH 49/49] Update mcs1_create_table_data_types.test

---
 .../columnstore/basic/t/mcs1_create_table_data_types.test       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
index 2afd4d69b..19e38f1ed 100644
--- a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
@@ -71,7 +71,7 @@ CREATE TABLE t4
  t4_TIMESTAMP TIMESTAMP,
  t4_TIMESTAMP_5 TIMESTAMP(5)
  )ENGINE=Columnstore;
---replace_regex /( COLLATE=latin1_swedish_ci)// /`t4_TIMESTAMP` timestamp NULL DEFAULT NULL,/`t4_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),/ /`t4_TIMESTAMP_5` timestamp(5) NULL DEFAULT NULL/`t4_TIMESTAMP_5` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000'/
+--replace_regex /( COLLATE=latin1_swedish_ci)// /`t4_TIMESTAMP` timestamp NULL DEFAULT NULL,/`t4_TIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),/ /`t4_TIMESTAMP_5` timestamp\(5\) NULL DEFAULT NULL/`t4_TIMESTAMP_5` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000'/
 SHOW CREATE TABLE t4;
 
 # Test with mixed datatypes