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