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