Skip to content

Commit 8d0f311

Browse files
author
Bogdan Degtyariov
committed
Added new collations for utf8mb4 charset
1 parent 3e1207d commit 8d0f311

File tree

1 file changed

+73
-25
lines changed

1 file changed

+73
-25
lines changed

‎driver/mysql_util.cpp

Lines changed: 73 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -239,31 +239,79 @@ const OUR_CHARSET our_charsets60[] =
239239
{ 223, "utf8", "utf8_general_mysql500_ci", 1, 3, "", cppconn_mbcharlen_utf8, check_mb_utf8_valid},
240240
{ 45, "utf8mb4", "utf8mb4_general_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
241241
{ 46, "utf8mb4", "utf8mb4_bin", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
242-
{ 224, "utf8mb4", "utf8mb4_unicode_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
243-
{ 225, "utf8mb4", "utf8mb4_icelandic_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
244-
{ 226, "utf8mb4", "utf8mb4_latvian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
245-
{ 227, "utf8mb4", "utf8mb4_romanian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
246-
{ 228, "utf8mb4", "utf8mb4_slovenian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
247-
{ 229, "utf8mb4", "utf8mb4_polish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
248-
{ 230, "utf8mb4", "utf8mb4_estonian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
249-
{ 231, "utf8mb4", "utf8mb4_spanish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
250-
{ 232, "utf8mb4", "utf8mb4_swedish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
251-
{ 233, "utf8mb4", "utf8mb4_turkish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
252-
{ 234, "utf8mb4", "utf8mb4_czech_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
253-
{ 235, "utf8mb4", "utf8mb4_danish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
254-
{ 236, "utf8mb4", "utf8mb4_lithuanian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
255-
{ 237, "utf8mb4", "utf8mb4_slovak_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
256-
{ 238, "utf8mb4", "utf8mb4_spanish2_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
257-
{ 239, "utf8mb4", "utf8mb4_roman_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
258-
{ 240, "utf8mb4", "utf8mb4_persian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
259-
{ 241, "utf8mb4", "utf8mb4_esperanto_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
260-
{ 242, "utf8mb4", "utf8mb4_hungarian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
261-
{ 243, "utf8mb4", "utf8mb4_sinhala_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
262-
{ 244, "utf8mb4", "utf8mb4_german2_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
263-
{ 245, "utf8mb4", "utf8mb4_croatian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
264-
{ 246, "utf8mb4", "utf8mb4_unicode_520_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
265-
{ 247, "utf8mb4", "utf8mb4_vietnamese_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
266-
{ 248, "utf8mb4", "utf8mb4_vietnamese_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid},
242+
{ 224, "utf8mb4", "utf8mb4_unicode_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
243+
{ 225, "utf8mb4", "utf8mb4_icelandic_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
244+
{ 226, "utf8mb4", "utf8mb4_latvian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
245+
{ 227, "utf8mb4", "utf8mb4_romanian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
246+
{ 228, "utf8mb4", "utf8mb4_slovenian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
247+
{ 229, "utf8mb4", "utf8mb4_polish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
248+
{ 230, "utf8mb4", "utf8mb4_estonian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
249+
{ 231, "utf8mb4", "utf8mb4_spanish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
250+
{ 232, "utf8mb4", "utf8mb4_swedish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
251+
{ 233, "utf8mb4", "utf8mb4_turkish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
252+
{ 234, "utf8mb4", "utf8mb4_czech_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
253+
{ 235, "utf8mb4", "utf8mb4_danish_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
254+
{ 236, "utf8mb4", "utf8mb4_lithuanian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
255+
{ 237, "utf8mb4", "utf8mb4_slovak_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
256+
{ 238, "utf8mb4", "utf8mb4_spanish2_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
257+
{ 239, "utf8mb4", "utf8mb4_roman_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
258+
{ 240, "utf8mb4", "utf8mb4_persian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
259+
{ 241, "utf8mb4", "utf8mb4_esperanto_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
260+
{ 242, "utf8mb4", "utf8mb4_hungarian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
261+
{ 243, "utf8mb4", "utf8mb4_sinhala_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
262+
{ 244, "utf8mb4", "utf8mb4_german2_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
263+
{ 245, "utf8mb4", "utf8mb4_croatian_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
264+
{ 246, "utf8mb4", "utf8mb4_unicode_520_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
265+
{ 247, "utf8mb4", "utf8mb4_vietnamese_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
266+
{ 255, "utf8mb4", "utf8mb4_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
267+
{ 256, "utf8mb4", "utf8mb4_de_pb_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
268+
{ 257, "utf8mb4", "utf8mb4_is_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
269+
{ 258, "utf8mb4", "utf8mb4_lv_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
270+
{ 259, "utf8mb4", "utf8mb4_ro_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
271+
{ 260, "utf8mb4", "utf8mb4_sl_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
272+
{ 261, "utf8mb4", "utf8mb4_pl_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
273+
{ 262, "utf8mb4", "utf8mb4_et_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
274+
{ 263, "utf8mb4", "utf8mb4_es_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
275+
{ 264, "utf8mb4", "utf8mb4_sv_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
276+
{ 265, "utf8mb4", "utf8mb4_tr_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
277+
{ 266, "utf8mb4", "utf8mb4_cs_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
278+
{ 267, "utf8mb4", "utf8mb4_da_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
279+
{ 268, "utf8mb4", "utf8mb4_lt_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
280+
{ 269, "utf8mb4", "utf8mb4_sk_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
281+
{ 270, "utf8mb4", "utf8mb4_es_trad_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
282+
{ 271, "utf8mb4", "utf8mb4_la_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
283+
{ 273, "utf8mb4", "utf8mb4_eo_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
284+
{ 274, "utf8mb4", "utf8mb4_hu_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
285+
{ 275, "utf8mb4", "utf8mb4_hr_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
286+
{ 277, "utf8mb4", "utf8mb4_vi_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
287+
{ 278, "utf8mb4", "utf8mb4_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
288+
{ 279, "utf8mb4", "utf8mb4_de_pb_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
289+
{ 280, "utf8mb4", "utf8mb4_is_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
290+
{ 281, "utf8mb4", "utf8mb4_lv_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
291+
{ 282, "utf8mb4", "utf8mb4_ro_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
292+
{ 283, "utf8mb4", "utf8mb4_sl_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
293+
{ 284, "utf8mb4", "utf8mb4_pl_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
294+
{ 285, "utf8mb4", "utf8mb4_et_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
295+
{ 286, "utf8mb4", "utf8mb4_es_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
296+
{ 287, "utf8mb4", "utf8mb4_sv_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
297+
{ 288, "utf8mb4", "utf8mb4_tr_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
298+
{ 289, "utf8mb4", "utf8mb4_cs_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
299+
{ 290, "utf8mb4", "utf8mb4_da_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
300+
{ 291, "utf8mb4", "utf8mb4_lt_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
301+
{ 292, "utf8mb4", "utf8mb4_sk_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
302+
{ 293, "utf8mb4", "utf8mb4_es_trad_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
303+
{ 294, "utf8mb4", "utf8mb4_la_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
304+
{ 296, "utf8mb4", "utf8mb4_eo_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
305+
{ 297, "utf8mb4", "utf8mb4_hu_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
306+
{ 298, "utf8mb4", "utf8mb4_hr_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
307+
{ 300, "utf8mb4", "utf8mb4_vi_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
308+
{ 303, "utf8mb4", "utf8mb4_ja_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
309+
{ 304, "utf8mb4", "utf8mb4_ja_0900_as_cs_ks", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
310+
{ 305, "utf8mb4", "utf8mb4_0900_as_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
311+
{ 306, "utf8mb4", "utf8mb4_ru_0900_ai_ci", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
312+
{ 307, "utf8mb4", "utf8mb4_ru_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
313+
{ 308, "utf8mb4", "utf8mb4_zh_0900_as_cs", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
314+
{ 309, "utf8mb4", "utf8mb4_0900_bin", 1, 4, "", cppconn_mbcharlen_utf8mb4, check_mb_utf8mb4_valid },
267315

268316
{248, "gb18030", "gb18030_chinese_ci",1, 4, "", NULL, NULL },
269317
{249, "gb18030", "gb18030_bin",1, 4, "", NULL, NULL },

0 commit comments

Comments
 (0)