Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 41 insertions, 0 deletions

diff --git a/mysql-test/suite/funcs_1/r/charset_collation.result b/mysql-test/suite/funcs_1/r/charset_collation.result
new file mode 100644
index 00000000..c0c36d9e
--- /dev/null
+++ b/mysql-test/suite/funcs_1/r/charset_collation.result
@@ -0,0 +1,41 @@
+DROP USER dbdict_test@localhost;
+CREATE USER dbdict_test@localhost;
+connect  con,localhost,dbdict_test,,;
+
+SELECT *
+FROM information_schema.character_sets
+WHERE character_set_name IN ('utf8mb3','latin1','binary')
+ORDER BY character_set_name;
+CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
+binary	binary	Binary pseudo charset	1
+latin1	latin1_swedish_ci	cp1252 West European	1
+utf8mb3	utf8mb3_general_ci	UTF-8 Unicode	3
+
+SELECT *
+FROM information_schema.collations
+WHERE character_set_name IN ('utf8mb3','latin1','binary')
+AND (collation_name LIKE CONCAT(character_set_name,'_general_ci')
+OR
+collation_name LIKE CONCAT(character_set_name,'_bin'))
+ORDER BY collation_name;
+COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
+latin1_bin	latin1	47		Yes	1
+latin1_general_ci	latin1	48		Yes	1
+utf8mb3_bin	utf8mb3	83		Yes	1
+utf8mb3_general_ci	utf8mb3	33	Yes	Yes	1
+
+SELECT *
+FROM information_schema.collation_character_set_applicability
+WHERE character_set_name IN ('utf8mb3','latin1','binary')
+AND (collation_name LIKE CONCAT(character_set_name,'_general_ci')
+OR
+collation_name LIKE CONCAT(character_set_name,'_bin'))
+ORDER BY collation_name, character_set_name;
+COLLATION_NAME	CHARACTER_SET_NAME	FULL_COLLATION_NAME	ID	IS_DEFAULT
+latin1_bin	latin1	latin1_bin	47	
+latin1_general_ci	latin1	latin1_general_ci	48	
+utf8mb3_bin	utf8mb3	utf8mb3_bin	83	
+utf8mb3_general_ci	utf8mb3	utf8mb3_general_ci	33	Yes
+connection default;
+disconnect con;
+DROP USER dbdict_test@localhost;