diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_char1_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_char1_latin1_swedish_ci.result
index 132021487..2372c36d4 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char1_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char1_latin1_swedish_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
index e3d1035e3..228437b13 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
index acecc998b..46b8570ba 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
index 041034aa5..4f1a8a1be 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
index 1c9a6f1c9..e80c6a135 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
index b79566b02..68311de31 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
index f14bd1d5c..5cd854cc5 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
index fe6aa6599..af7430a6e 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
index b9175ed88..3eab194d9 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
index 065f7a3bf..9040d311f 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
index ee5afa25f..424ef9409 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
index 52513f126..6a1cbb89a 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
index 48eba6fb7..bafda653c 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
index e52ff47c5..f1fae429b 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
index a30b1be1d..0ae823c6e 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
index 620068973..83a1b6300 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
index 669fbd2d9..3cac9a075 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
index b12351c2f..7c1db8d05 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
index f4e40e9b1..b6644ac91 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
index 3d4546dc5..801d98977 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
index 8db2cd04a..31d36baa3 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
index 00a9c9796..eb636d6f2 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
index 5a90cc3dc..6011852ab 100644
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
@@ -10,8 +10,8 @@ SELECT query AS '';
 EXECUTE IMMEDIATE query;
 END;
 $$
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
 BEGIN
 DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
 SET query=REPLACE(query,'=',op);
diff --git a/mysql-test/columnstore/basic/t/ctype_cmp_create.inc b/mysql-test/columnstore/basic/t/ctype_cmp_create.inc
index d4597beb7..2b194bab1 100644
--- a/mysql-test/columnstore/basic/t/ctype_cmp_create.inc
+++ b/mysql-test/columnstore/basic/t/ctype_cmp_create.inc
@@ -1,6 +1,8 @@
 --source default_storage_engine_by_combination.inc
 
 --disable_query_log
+SET character_set_connection = 'utf8';
+SET collation_connection = 'utf8mb3_general_ci';
 --eval SET @mysqltest_file='$MYSQLTEST_FILE';
 SET @mysqltest_file=regexp_replace(@mysqltest_file, '^(.*)/([a-z0-9_]*)([.]test$)','\\2');
 --enable_query_log
@@ -28,8 +30,9 @@ DELIMITER ;$$
 
 
 DELIMITER $$;
-CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8,
-                                val VARCHAR(64) CHARACTER SET utf8)
+CREATE PROCEDURE test01_execval(op VARCHAR(3) CHARACTER SET utf8 COLLATE utf8mb3_general_ci,
+                                val VARCHAR(64) CHARACTER SET utf8 COLLATE utf8mb3_general_ci)
+
 BEGIN
   DECLARE query TEXT DEFAULT 'SELECT HEX(c1), QUOTE(c1) FROM t1 WHERE c1=''VAL''';
   SET query=REPLACE(query,'=',op);