database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-19897 Rename source code variable names from utf8 to utf8mb3

Browse Source
This commit is contained in:
Alexander Barkov
2019-06-28 09:05:12 +04:00
parent 323a87b591
commit 3e7e87ddcc
56 changed files with 727 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/json_lib/json_lib-t.c
View File

@@ -173,7 +173,7 @@ test_search()
int main()
{
ci= &my_charset_utf8_general_ci;
ci= &my_charset_utf8mb3_general_ci;
plan(6);
diag("Testing json_lib functions.");

8
unittest/mysys/ma_dyncol-t.c
View File

@@ -197,12 +197,12 @@ static CHARSET_INFO *charset_list[]=
&my_charset_ujis_japanese_ci,
&my_charset_ujis_bin,
#endif
#ifdef HAVE_CHARSET_utf8
&my_charset_utf8_general_ci,
#ifdef HAVE_CHARSET_utf8mb3
&my_charset_utf8mb3_general_ci,
#ifdef HAVE_UCA_COLLATIONS
&my_charset_utf8_unicode_ci,
&my_charset_utf8mb3_unicode_ci,
#endif
&my_charset_utf8_bin,
&my_charset_utf8mb3_bin,
#endif
};

2
unittest/sql/explain_filename-t.cc
View File

@@ -31,7 +31,7 @@ static const char **error_messages[1]= { error_messages_txt };
int setup()
{
system_charset_info = &my_charset_utf8_bin;
system_charset_info = &my_charset_utf8mb3_bin;
my_default_lc_messages = &my_locale_en_US;
/* Populate the necessary error messages */

14
unittest/strings/strings-t.c
View File

@@ -85,12 +85,12 @@ static CHARSET_INFO *charset_list[]=
&my_charset_ujis_japanese_ci,
&my_charset_ujis_bin,
#endif
#ifdef HAVE_CHARSET_utf8
&my_charset_utf8_general_ci,
#ifdef HAVE_CHARSET_utf8mb3
&my_charset_utf8mb3_general_ci,
#ifdef HAVE_UCA_COLLATIONS
&my_charset_utf8_unicode_ci,
&my_charset_utf8mb3_unicode_ci,
#endif
&my_charset_utf8_bin,
&my_charset_utf8mb3_bin,
#endif
};
@@ -743,9 +743,9 @@ test_strcollsp()
failed+= strcollsp(&my_charset_utf32_bin, strcoll_utf32_common);
#endif
#ifdef HAVE_CHARSET_utf8
failed+= strcollsp(&my_charset_utf8_general_ci, strcoll_utf8mb3_common);
failed+= strcollsp(&my_charset_utf8_general_mysql500_ci, strcoll_utf8mb3_common);
failed+= strcollsp(&my_charset_utf8_bin, strcoll_utf8mb3_common);
failed+= strcollsp(&my_charset_utf8mb3_general_ci, strcoll_utf8mb3_common);
failed+= strcollsp(&my_charset_utf8mb3_general_mysql500_ci, strcoll_utf8mb3_common);
failed+= strcollsp(&my_charset_utf8mb3_bin, strcoll_utf8mb3_common);
#endif
#ifdef HAVE_CHARSET_utf8mb4
failed+= strcollsp(&my_charset_utf8mb4_general_ci, strcoll_utf8mb3_common);