Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6.

1 files changed, 20 insertions, 0 deletions

diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index 938d228b020..4308117ddfb 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.c
@@ -45,6 +45,8 @@ extern struct charset_info_st my_charset_ucs2_esperanto_uca_ci;
 extern struct charset_info_st my_charset_ucs2_hungarian_uca_ci;
 extern struct charset_info_st my_charset_ucs2_croatian_mysql561_uca_ci;
 extern struct charset_info_st my_charset_ucs2_sinhala_uca_ci;
+extern struct charset_info_st my_charset_ucs2_unicode_520_ci;
+extern struct charset_info_st my_charset_ucs2_vietnamese_ci;
 extern struct charset_info_st my_charset_ucs2_croatian_uca_ci;
 #endif
 
@@ -71,6 +73,8 @@ extern struct charset_info_st my_charset_utf32_esperanto_uca_ci;
 extern struct charset_info_st my_charset_utf32_hungarian_uca_ci;
 extern struct charset_info_st my_charset_utf32_croatian_mysql561_uca_ci;
 extern struct charset_info_st my_charset_utf32_sinhala_uca_ci;
+extern struct charset_info_st my_charset_utf32_unicode_520_ci;
+extern struct charset_info_st my_charset_utf32_vietnamese_ci;
 extern struct charset_info_st my_charset_utf32_croatian_uca_ci;
 #endif /* HAVE_CHARSET_utf32 */
 
@@ -97,6 +101,8 @@ extern struct charset_info_st my_charset_utf16_esperanto_uca_ci;
 extern struct charset_info_st my_charset_utf16_hungarian_uca_ci;
 extern struct charset_info_st my_charset_utf16_croatian_mysql561_uca_ci;
 extern struct charset_info_st my_charset_utf16_sinhala_uca_ci;
+extern struct charset_info_st my_charset_utf16_unicode_520_ci;
+extern struct charset_info_st my_charset_utf16_vietnamese_ci;
 extern struct charset_info_st my_charset_utf16_croatian_uca_ci;
 #endif  /* HAVE_CHARSET_utf16 */
 
@@ -123,6 +129,8 @@ extern struct charset_info_st my_charset_utf8_esperanto_uca_ci;
 extern struct charset_info_st my_charset_utf8_hungarian_uca_ci;
 extern struct charset_info_st my_charset_utf8_croatian_mysql561_uca_ci;
 extern struct charset_info_st my_charset_utf8_sinhala_uca_ci;
+extern struct charset_info_st my_charset_utf8_unicode_520_ci;
+extern struct charset_info_st my_charset_utf8_vietnamese_ci;
 extern struct charset_info_st my_charset_utf8_croatian_uca_ci;
 #ifdef HAVE_UTF8_GENERAL_CS
 extern struct charset_info_st my_charset_utf8_general_cs;
@@ -151,6 +159,8 @@ extern struct charset_info_st my_charset_utf8mb4_esperanto_uca_ci;
 extern struct charset_info_st my_charset_utf8mb4_hungarian_uca_ci;
 extern struct charset_info_st my_charset_utf8mb4_croatian_mysql561_uca_ci;
 extern struct charset_info_st my_charset_utf8mb4_sinhala_uca_ci;
+extern struct charset_info_st my_charset_utf8mb4_unicode_520_ci;
+extern struct charset_info_st my_charset_utf8mb4_vietnamese_ci;
 extern struct charset_info_st my_charset_utf8mb4_croatian_uca_ci;
 #endif /* HAVE_CHARSET_utf8mb4 */
 
@@ -242,6 +252,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
   add_compiled_collation(&my_charset_ucs2_hungarian_uca_ci);
   add_compiled_collation(&my_charset_ucs2_croatian_mysql561_uca_ci);
   add_compiled_collation(&my_charset_ucs2_sinhala_uca_ci);
+  add_compiled_collation(&my_charset_ucs2_unicode_520_ci);
+  add_compiled_collation(&my_charset_ucs2_vietnamese_ci);
   add_compiled_collation(&my_charset_ucs2_croatian_uca_ci);
 #endif
 #endif
@@ -281,6 +293,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
   add_compiled_collation(&my_charset_utf8_hungarian_uca_ci);
   add_compiled_collation(&my_charset_utf8_croatian_mysql561_uca_ci);
   add_compiled_collation(&my_charset_utf8_sinhala_uca_ci);
+  add_compiled_collation(&my_charset_utf8_unicode_520_ci);
+  add_compiled_collation(&my_charset_utf8_vietnamese_ci);
   add_compiled_collation(&my_charset_utf8_croatian_uca_ci);
 #endif
 #endif /* HAVE_CHARSET_utf8 */
@@ -312,6 +326,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
   add_compiled_collation(&my_charset_utf8mb4_hungarian_uca_ci);
   add_compiled_collation(&my_charset_utf8mb4_croatian_mysql561_uca_ci);
   add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
+  add_compiled_collation(&my_charset_utf8mb4_unicode_520_ci);
+  add_compiled_collation(&my_charset_utf8mb4_vietnamese_ci);
   add_compiled_collation(&my_charset_utf8mb4_croatian_uca_ci);
 #endif /* HAVE_UCA_COLLATIONS  */
 #endif /* HAVE_CHARSET_utf8mb4 */
@@ -345,6 +361,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
   add_compiled_collation(&my_charset_utf16_hungarian_uca_ci);
   add_compiled_collation(&my_charset_utf16_croatian_mysql561_uca_ci);
   add_compiled_collation(&my_charset_utf16_sinhala_uca_ci);
+  add_compiled_collation(&my_charset_utf16_unicode_520_ci);
+  add_compiled_collation(&my_charset_utf16_vietnamese_ci);
   add_compiled_collation(&my_charset_utf16_croatian_uca_ci);
 #endif /* HAVE_UCA_COLLATIONS */
 #endif /* HAVE_CHARSET_utf16 */
@@ -376,6 +394,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
   add_compiled_collation(&my_charset_utf32_hungarian_uca_ci);
   add_compiled_collation(&my_charset_utf32_croatian_mysql561_uca_ci);
   add_compiled_collation(&my_charset_utf32_sinhala_uca_ci);
+  add_compiled_collation(&my_charset_utf32_unicode_520_ci);
+  add_compiled_collation(&my_charset_utf32_vietnamese_ci);
   add_compiled_collation(&my_charset_utf32_croatian_uca_ci);
 #endif /* HAVE_UCA_COLLATIONS */
 #endif /* HAVE_CHARSET_utf32 */