Skip to content

Commit b67d9ed

Browse files
author
Tor Didriksen
committed
Bug #34025412 Rename utf8_xxx functions and data structures to utf8mb3_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
1 parent 58f1533 commit b67d9ed

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

strings/ctype-utf8.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5722,7 +5722,7 @@ static uint my_mbcharlen_utf8mb3(const CHARSET_INFO *cs [[maybe_unused]],
57225722
}
57235723
} // extern "C"
57245724

5725-
static MY_COLLATION_HANDLER my_collation_utf8_general_ci_handler = {
5725+
static MY_COLLATION_HANDLER my_collation_utf8mb3_general_ci_handler = {
57265726
nullptr, /* init */
57275727
nullptr,
57285728
my_strnncoll_utf8mb3,
@@ -5736,7 +5736,7 @@ static MY_COLLATION_HANDLER my_collation_utf8_general_ci_handler = {
57365736
my_hash_sort_utf8mb3,
57375737
my_propagate_complex};
57385738

5739-
static MY_COLLATION_HANDLER my_collation_utf8_bin_handler = {
5739+
static MY_COLLATION_HANDLER my_collation_utf8mb3_bin_handler = {
57405740
nullptr, /* init */
57415741
nullptr,
57425742
my_strnncoll_mb_bin,
@@ -5810,7 +5810,7 @@ CHARSET_INFO my_charset_utf8_general_ci = {
58105810
false, /* escape_with_backslash_is_dangerous */
58115811
1, /* levels_for_compare */
58125812
&my_charset_utf8_handler,
5813-
&my_collation_utf8_general_ci_handler,
5813+
&my_collation_utf8mb3_general_ci_handler,
58145814
PAD_SPACE};
58155815

58165816
CHARSET_INFO my_charset_utf8_tolower_ci = {
@@ -5845,7 +5845,7 @@ CHARSET_INFO my_charset_utf8_tolower_ci = {
58455845
false, /* escape_with_backslash_is_dangerous */
58465846
1, /* levels_for_compare */
58475847
&my_charset_utf8_handler,
5848-
&my_collation_utf8_general_ci_handler,
5848+
&my_collation_utf8mb3_general_ci_handler,
58495849
PAD_SPACE};
58505850

58515851
CHARSET_INFO my_charset_utf8_general_mysql500_ci = {
@@ -5880,7 +5880,7 @@ CHARSET_INFO my_charset_utf8_general_mysql500_ci = {
58805880
false, /* escape_with_backslash_is_dangerous */
58815881
1, /* levels_for_compare */
58825882
&my_charset_utf8_handler,
5883-
&my_collation_utf8_general_ci_handler,
5883+
&my_collation_utf8mb3_general_ci_handler,
58845884
PAD_SPACE};
58855885

58865886
CHARSET_INFO my_charset_utf8_bin = {
@@ -5915,7 +5915,7 @@ CHARSET_INFO my_charset_utf8_bin = {
59155915
false, /* escape_with_backslash_is_dangerous */
59165916
1, /* levels_for_compare */
59175917
&my_charset_utf8_handler,
5918-
&my_collation_utf8_bin_handler,
5918+
&my_collation_utf8mb3_bin_handler,
59195919
PAD_SPACE};
59205920

59215921
/*

0 commit comments

Comments
 (0)