Merge pull request #2613 from mariadb-corporation/mtrfix_kp_221104_d6_ar

Mtrfix kp 221104 d6 ar
2025-08-10 01:22:48 +03:00 · 2022-11-23 17:42:32 +03:00
parent a4c39a0943 a4d4909196
commit c04f8991db
35 changed files with 110 additions and 15 deletions
--- 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
--- 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 /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;
--error 1815
 ALTER TABLE cs1 ADD COLUMN d10 DECIMAL(40);
--error 1425
+--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

 DROP TABLE cs1;
 DROP TABLE cs2;
--- 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;
--- 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;
--- a/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+++ b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test
@@ -12,18 +12,23 @@ 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;

--error ER_CONFLICTING_DECLARATIONS
+--disable_warnings
+--disable_abort_on_error
+--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;
--error ER_CONFLICTING_DECLARATIONS
+--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;
--error ER_CONFLICTING_DECLARATIONS
+--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;
--error ER_CONFLICTING_DECLARATIONS
+--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;
--error ER_CONFLICTING_DECLARATIONS
+--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

 # Clean UP
 DROP DATABASE mcs118_db;
--- 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)// /  `t` timestamp NULL DEFAULT NULL,/  `t` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),/
 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;
--- 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;
--- 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);
--- 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 /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

 # function drop
 DROP FUNCTION f1;
@@ -68,7 +70,9 @@ BEGIN
  RETURN 'func2';
 END//
 DELIMITER ;//
+--replace_regex / COLLATE latin1_swedish_ci//
 SHOW CREATE FUNCTION func2;
+
 SELECT func2();

 DROP DATABASE mcs16_db;
--- 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');
--- 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');
--- 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;
--- 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);
--- 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);
--- 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);
--- 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');
--- 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);
--- 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;
--- 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;
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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;
@@ -56,12 +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`.`t1`)/'t1'/
 INSERT INTO mcs19_db.t1 VALUES(2);
--error ER_TABLEACCESS_DENIED_ERROR
+--replace_regex /(`mcs19_db`.`t1`)/'t1'/
 SELECT * FROM mcs19_db.t1;
--error ER_TABLEACCESS_DENIED_ERROR
+--replace_regex /(`mcs19_db`.`t1`)/'t1'/
 CREATE TABLE mcs19_db.t1;
+--enable_abort_on_error

 # Clean up
 connection default;
--- 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)// /`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
@@ -83,6 +87,7 @@ CREATE TABLE t5
 t5_TIME TIME,
 t5_TIMESTAMP TIMESTAMP
 )ENGINE=Columnstore;
+--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
--- 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;
--- 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
--- 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;
--- 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;
--- 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 /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;
--error ER_TOO_BIG_SCALE
+--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

 # Clean UP
 DROP DATABASE mcs69_db;
--- 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);
--- 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
--- 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;

--- 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;