Skip to content

Commit

Permalink
Bug #34025412 Rename utf8_xxx functions and data structures to utf8mb…
Browse files Browse the repository at this point in the history
…3_xxx [noclose]

For better code readability/maintainability, rename functions and data
structures used for handling utf8mb3 charsets and collations.

This patch renames my_collation_utf8_xx_handler.

Change-Id: Id397b98d1822c9df2099c0fdc8dda1ce38f49ac7
  • Loading branch information
Tor Didriksen committed May 4, 2022
1 parent 58f1533 commit b67d9ed
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions strings/ctype-utf8.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5722,7 +5722,7 @@ static uint my_mbcharlen_utf8mb3(const CHARSET_INFO *cs [[maybe_unused]],
}
} // extern "C"

static MY_COLLATION_HANDLER my_collation_utf8_general_ci_handler = {
static MY_COLLATION_HANDLER my_collation_utf8mb3_general_ci_handler = {
nullptr, /* init */
nullptr,
my_strnncoll_utf8mb3,
Expand All @@ -5736,7 +5736,7 @@ static MY_COLLATION_HANDLER my_collation_utf8_general_ci_handler = {
my_hash_sort_utf8mb3,
my_propagate_complex};

static MY_COLLATION_HANDLER my_collation_utf8_bin_handler = {
static MY_COLLATION_HANDLER my_collation_utf8mb3_bin_handler = {
nullptr, /* init */
nullptr,
my_strnncoll_mb_bin,
Expand Down Expand Up @@ -5810,7 +5810,7 @@ CHARSET_INFO my_charset_utf8_general_ci = {
false, /* escape_with_backslash_is_dangerous */
1, /* levels_for_compare */
&my_charset_utf8_handler,
&my_collation_utf8_general_ci_handler,
&my_collation_utf8mb3_general_ci_handler,
PAD_SPACE};

CHARSET_INFO my_charset_utf8_tolower_ci = {
Expand Down Expand Up @@ -5845,7 +5845,7 @@ CHARSET_INFO my_charset_utf8_tolower_ci = {
false, /* escape_with_backslash_is_dangerous */
1, /* levels_for_compare */
&my_charset_utf8_handler,
&my_collation_utf8_general_ci_handler,
&my_collation_utf8mb3_general_ci_handler,
PAD_SPACE};

CHARSET_INFO my_charset_utf8_general_mysql500_ci = {
Expand Down Expand Up @@ -5880,7 +5880,7 @@ CHARSET_INFO my_charset_utf8_general_mysql500_ci = {
false, /* escape_with_backslash_is_dangerous */
1, /* levels_for_compare */
&my_charset_utf8_handler,
&my_collation_utf8_general_ci_handler,
&my_collation_utf8mb3_general_ci_handler,
PAD_SPACE};

CHARSET_INFO my_charset_utf8_bin = {
Expand Down Expand Up @@ -5915,7 +5915,7 @@ CHARSET_INFO my_charset_utf8_bin = {
false, /* escape_with_backslash_is_dangerous */
1, /* levels_for_compare */
&my_charset_utf8_handler,
&my_collation_utf8_bin_handler,
&my_collation_utf8mb3_bin_handler,
PAD_SPACE};

/*
Expand Down

0 comments on commit b67d9ed

Please sign in to comment.