aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mysql.c
diff options
context:
space:
mode:
authorDaniƫl van Eeden <wireshark@myname.nl>2014-08-05 21:43:30 +0200
committerAnders Broman <a.broman58@gmail.com>2014-08-06 04:45:31 +0000
commit91b2adfe4995a4be31041f5e667e1405a2bdc4ec (patch)
treebe5c7608e38144bdfb8e12a9a2753e40ba2ff4ec /epan/dissectors/packet-mysql.c
parent2dcec4e268b792f45fd4d8654a0a66aec09dd76d (diff)
MySQL: add utf8mb4 charsets
Change-Id: I7dfda411ed1d91e9eea43a1eb0cbc70807fedfbb Reviewed-on: https://code.wireshark.org/review/3451 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mysql.c')
-rw-r--r--epan/dissectors/packet-mysql.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 7e292b51d3..ee12851266 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -308,6 +308,8 @@ static const value_string mysql_collation_vals[] = {
{42, "latin7 COLLATE latin7_general_cs"},
{43, "macce COLLATE macce_bin"},
{44, "cp1250 COLLATE cp1250_croatian_ci"},
+ {45, "utf8mb4 COLLATE utf8mb4_general_ci"},
+ {46, "utf8mb4 COLLATE utf8mb4_bin"},
{47, "latin1 COLLATE latin1_bin"},
{48, "latin1 COLLATE latin1_general_ci"},
{49, "latin1 COLLATE latin1_general_cs"},
@@ -361,6 +363,36 @@ static const value_string mysql_collation_vals[] = {
{208, "utf8 COLLATE utf8_persian_ci"},
{209, "utf8 COLLATE utf8_esperanto_ci"},
{210, "utf8 COLLATE utf8_hungarian_ci"},
+ {211, "utf8 COLLATE utf8_sinhala_ci"},
+ {212, "utf8 COLLATE utf8_german2_ci"},
+ {213, "utf8 COLLATE utf8_croatian_ci"},
+ {214, "utf8 COLLATE utf8_unicode_520_ci"},
+ {215, "utf8 COLLATE utf8_vietnamese_ci"},
+ {223, "utf8 COLLATE utf8_general_mysql500_ci"},
+ {224, "utf8mb4 COLLATE utf8mb4_unicode_ci"},
+ {225, "utf8mb4 COLLATE utf8mb4_icelandic_ci"},
+ {226, "utf8mb4 COLLATE utf8mb4_latvian_ci"},
+ {227, "utf8mb4 COLLATE utf8mb4_romanian_ci"},
+ {228, "utf8mb4 COLLATE utf8mb4_slovenian_ci"},
+ {229, "utf8mb4 COLLATE utf8mb4_polish_ci"},
+ {230, "utf8mb4 COLLATE utf8mb4_estonian_ci"},
+ {231, "utf8mb4 COLLATE utf8mb4_spanish_ci"},
+ {232, "utf8mb4 COLLATE utf8mb4_swedish_ci"},
+ {233, "utf8mb4 COLLATE utf8mb4_turkish_ci"},
+ {234, "utf8mb4 COLLATE utf8mb4_czech_ci"},
+ {235, "utf8mb4 COLLATE utf8mb4_danish_ci"},
+ {236, "utf8mb4 COLLATE utf8mb4_lithuanian_ci"},
+ {237, "utf8mb4 COLLATE utf8mb4_slovak_ci"},
+ {238, "utf8mb4 COLLATE utf8mb4_spanish2_ci"},
+ {239, "utf8mb4 COLLATE utf8mb4_roman_ci"},
+ {240, "utf8mb4 COLLATE utf8mb4_persian_ci"},
+ {241, "utf8mb4 COLLATE utf8mb4_esperanto_ci"},
+ {242, "utf8mb4 COLLATE utf8mb4_hungarian_ci"},
+ {243, "utf8mb4 COLLATE utf8mb4_sinhala_ci"},
+ {244, "utf8mb4 COLLATE utf8mb4_german2_ci"},
+ {245, "utf8mb4 COLLATE utf8mb4_croatian_ci"},
+ {246, "utf8mb4 COLLATE utf8mb4_unicode_520_ci"},
+ {247, "utf8mb4 COLLATE utf8mb4_vietnamese_ci"},
{0, NULL}
};