Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6.

mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result

@@ -79,6 +79,8 @@ utf8_hungarian_ci	utf8	210		#	#
 utf8_sinhala_ci	utf8	211		#	#
 utf8_german2_ci	utf8	212		#	#
 utf8_croatian_mysql561_ci	utf8	213		#	#
+utf8_unicode_520_ci	utf8	214		#	#
+utf8_vietnamese_ci	utf8	215		#	#
 utf8_general_mysql500_ci	utf8	223		#	#
 utf8_croatian_ci	utf8	576		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
@@ -105,6 +107,8 @@ ucs2_hungarian_ci	ucs2	146		#	#
 ucs2_sinhala_ci	ucs2	147		#	#
 ucs2_german2_ci	ucs2	148		#	#
 ucs2_croatian_mysql561_ci	ucs2	149		#	#
+ucs2_unicode_520_ci	ucs2	150		#	#
+ucs2_vietnamese_ci	ucs2	151		#	#
 ucs2_general_mysql500_ci	ucs2	159		#	#
 ucs2_croatian_ci	ucs2	640		#	#
 cp866_general_ci	cp866	36	Yes	#	#
@@ -145,6 +149,8 @@ utf8mb4_hungarian_ci	utf8mb4	242		#	#
 utf8mb4_sinhala_ci	utf8mb4	243		#	#
 utf8mb4_german2_ci	utf8mb4	244		#	#
 utf8mb4_croatian_mysql561_ci	utf8mb4	245		#	#
+utf8mb4_unicode_520_ci	utf8mb4	246		#	#
+utf8mb4_vietnamese_ci	utf8mb4	247		#	#
 utf8mb4_croatian_ci	utf8mb4	608		#	#
 cp1251_bulgarian_ci	cp1251	14		#	#
 cp1251_ukrainian_ci	cp1251	23		#	#
@@ -175,6 +181,8 @@ utf16_hungarian_ci	utf16	119		#	#
 utf16_sinhala_ci	utf16	120		#	#
 utf16_german2_ci	utf16	121		#	#
 utf16_croatian_mysql561_ci	utf16	122		#	#
+utf16_unicode_520_ci	utf16	123		#	#
+utf16_vietnamese_ci	utf16	124		#	#
 utf16_croatian_ci	utf16	672		#	#
 utf16le_general_ci	utf16le	56	Yes	#	#
 utf16le_bin	utf16le	62		#	#
@@ -207,6 +215,8 @@ utf32_hungarian_ci	utf32	178		#	#
 utf32_sinhala_ci	utf32	179		#	#
 utf32_german2_ci	utf32	180		#	#
 utf32_croatian_mysql561_ci	utf32	181		#	#
+utf32_unicode_520_ci	utf32	182		#	#
+utf32_vietnamese_ci	utf32	183		#	#
 utf32_croatian_ci	utf32	736		#	#
 binary	binary	63	Yes	#	#
 geostd8_general_ci	geostd8	92	Yes	#	#