database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

Fix 'illegal mix of collation' in the Columnxtore MTR

Browse Source
This commit is contained in:
Timofey Turenko
2025-09-26 11:05:46 +03:00
committed by Leonid Fedorov
parent 8b8a6df5e3
commit fd3c385373
24 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/columnstore/basic/r/ctype_cmp_char1_latin1_swedish_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
View File

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

4
mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
View File

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

7
mysql-test/columnstore/basic/t/ctype_cmp_create.inc
View File

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