diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-06-28 09:05:12 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-06-28 12:37:04 +0400 |
| commit | 3e7e87ddccf71ba5328c257b7d642d6803fbca3a (patch) | |
| tree | 0ea22d4c533b84b2675c3d7c7555f5ad367222ac /mysys/charset.c | |
| parent | 323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff) | |
| download | mariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz | |
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index f44dc7606c1..7771f5800ef 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -262,7 +262,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs) } -#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8)) +#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8mb3)) /** Initialize a loaded collation. @param [OUT] to - The new charset_info_st structure to initialize. @@ -350,12 +350,12 @@ static int add_collation(struct charset_info_st *cs) } else if (!strcmp(cs->csname, "utf8") || !strcmp(cs->csname, "utf8mb3")) { -#if defined (HAVE_CHARSET_utf8) && defined(HAVE_UCA_COLLATIONS) +#if defined (HAVE_CHARSET_utf8mb3) && defined(HAVE_UCA_COLLATIONS) copy_uca_collation(newcs, newcs->state & MY_CS_NOPAD ? - &my_charset_utf8_unicode_nopad_ci : - &my_charset_utf8_unicode_ci, + &my_charset_utf8mb3_unicode_nopad_ci : + &my_charset_utf8mb3_unicode_ci, cs); - newcs->ctype= my_charset_utf8_unicode_ci.ctype; + newcs->ctype= my_charset_utf8mb3_unicode_ci.ctype; if (init_state_maps(newcs)) return MY_XML_ERROR; #endif |