Updates to test and result files in the 'engine' suites following changes in 5.5

2025-08-01 03:47:19 +03:00 · 2010-05-04 11:10:17 -07:00
parent d77f9505da
commit 8ac23986e7
84 changed files with 4151 additions and 4267 deletions
--- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
@ -76,6 +76,7 @@ utf8_roman_ci	utf8	207		#	#
 utf8_persian_ci	utf8	208		#	#
 utf8_esperanto_ci	utf8	209		#	#
 utf8_hungarian_ci	utf8	210		#	#
+utf8_sinhala_ci	utf8	211		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
 ucs2_unicode_ci	ucs2	128		#	#
@ -97,6 +98,7 @@ ucs2_roman_ci	ucs2	143		#	#
 ucs2_persian_ci	ucs2	144		#	#
 ucs2_esperanto_ci	ucs2	145		#	#
 ucs2_hungarian_ci	ucs2	146		#	#
+ucs2_sinhala_ci	ucs2	147		#	#
 cp866_general_ci	cp866	36	Yes	#	#
 cp866_bin	cp866	68		#	#
 keybcs2_general_ci	keybcs2	37	Yes	#	#
@ -111,16 +113,82 @@ latin7_estonian_cs	latin7	20		#	#
 latin7_general_ci	latin7	41	Yes	#	#
 latin7_general_cs	latin7	42		#	#
 latin7_bin	latin7	79		#	#
+utf8mb4_general_ci	utf8mb4	45	Yes	#	#
+utf8mb4_bin	utf8mb4	46		#	#
+utf8mb4_unicode_ci	utf8mb4	224		#	#
+utf8mb4_icelandic_ci	utf8mb4	225		#	#
+utf8mb4_latvian_ci	utf8mb4	226		#	#
+utf8mb4_romanian_ci	utf8mb4	227		#	#
+utf8mb4_slovenian_ci	utf8mb4	228		#	#
+utf8mb4_polish_ci	utf8mb4	229		#	#
+utf8mb4_estonian_ci	utf8mb4	230		#	#
+utf8mb4_spanish_ci	utf8mb4	231		#	#
+utf8mb4_swedish_ci	utf8mb4	232		#	#
+utf8mb4_turkish_ci	utf8mb4	233		#	#
+utf8mb4_czech_ci	utf8mb4	234		#	#
+utf8mb4_danish_ci	utf8mb4	235		#	#
+utf8mb4_lithuanian_ci	utf8mb4	236		#	#
+utf8mb4_slovak_ci	utf8mb4	237		#	#
+utf8mb4_spanish2_ci	utf8mb4	238		#	#
+utf8mb4_roman_ci	utf8mb4	239		#	#
+utf8mb4_persian_ci	utf8mb4	240		#	#
+utf8mb4_esperanto_ci	utf8mb4	241		#	#
+utf8mb4_hungarian_ci	utf8mb4	242		#	#
+utf8mb4_sinhala_ci	utf8mb4	243		#	#
 cp1251_bulgarian_ci	cp1251	14		#	#
 cp1251_ukrainian_ci	cp1251	23		#	#
 cp1251_bin	cp1251	50		#	#
 cp1251_general_ci	cp1251	51	Yes	#	#
 cp1251_general_cs	cp1251	52		#	#
+utf16_general_ci	utf16	54	Yes	#	#
+utf16_bin	utf16	55		#	#
+utf16_unicode_ci	utf16	101		#	#
+utf16_icelandic_ci	utf16	102		#	#
+utf16_latvian_ci	utf16	103		#	#
+utf16_romanian_ci	utf16	104		#	#
+utf16_slovenian_ci	utf16	105		#	#
+utf16_polish_ci	utf16	106		#	#
+utf16_estonian_ci	utf16	107		#	#
+utf16_spanish_ci	utf16	108		#	#
+utf16_swedish_ci	utf16	109		#	#
+utf16_turkish_ci	utf16	110		#	#
+utf16_czech_ci	utf16	111		#	#
+utf16_danish_ci	utf16	112		#	#
+utf16_lithuanian_ci	utf16	113		#	#
+utf16_slovak_ci	utf16	114		#	#
+utf16_spanish2_ci	utf16	115		#	#
+utf16_roman_ci	utf16	116		#	#
+utf16_persian_ci	utf16	117		#	#
+utf16_esperanto_ci	utf16	118		#	#
+utf16_hungarian_ci	utf16	119		#	#
+utf16_sinhala_ci	utf16	120		#	#
 cp1256_general_ci	cp1256	57	Yes	#	#
 cp1256_bin	cp1256	67		#	#
 cp1257_lithuanian_ci	cp1257	29		#	#
 cp1257_bin	cp1257	58		#	#
 cp1257_general_ci	cp1257	59	Yes	#	#
+utf32_general_ci	utf32	60	Yes	#	#
+utf32_bin	utf32	61		#	#
+utf32_unicode_ci	utf32	160		#	#
+utf32_icelandic_ci	utf32	161		#	#
+utf32_latvian_ci	utf32	162		#	#
+utf32_romanian_ci	utf32	163		#	#
+utf32_slovenian_ci	utf32	164		#	#
+utf32_polish_ci	utf32	165		#	#
+utf32_estonian_ci	utf32	166		#	#
+utf32_spanish_ci	utf32	167		#	#
+utf32_swedish_ci	utf32	168		#	#
+utf32_turkish_ci	utf32	169		#	#
+utf32_czech_ci	utf32	170		#	#
+utf32_danish_ci	utf32	171		#	#
+utf32_lithuanian_ci	utf32	172		#	#
+utf32_slovak_ci	utf32	173		#	#
+utf32_spanish2_ci	utf32	174		#	#
+utf32_roman_ci	utf32	175		#	#
+utf32_persian_ci	utf32	176		#	#
+utf32_esperanto_ci	utf32	177		#	#
+utf32_hungarian_ci	utf32	178		#	#
+utf32_sinhala_ci	utf32	179		#	#
 binary	binary	63	Yes	#	#
 geostd8_general_ci	geostd8	92	Yes	#	#
 geostd8_bin	geostd8	93		#	#
@ -131,136 +199,152 @@ eucjpms_bin	eucjpms	98		#	#
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER DATABASE d9   COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_bin	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_bin	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER DATABASE d9 DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_bin	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_bin	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER DATABASE d9   COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER DATABASE d9 DEFAULT COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER SCHEMA d9   COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_bin	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_bin	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER SCHEMA d9 DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_bin	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_bin	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER SCHEMA d9   COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 ALTER SCHEMA d9 DEFAULT COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	d9	ascii	ascii_general_ci	NULL
-NULL	information_schema	utf8	utf8_general_ci	NULL
-NULL	mtr	latin1	latin1_swedish_ci	NULL
-NULL	mysql	latin1	latin1_swedish_ci	NULL
-NULL	test	latin1	latin1_swedish_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL
 DROP DATABASE d9;