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 /unittest | |
| parent | 323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff) | |
| download | mariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz | |
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/json_lib/json_lib-t.c | 2 | ||||
| -rw-r--r-- | unittest/mysys/ma_dyncol-t.c | 8 | ||||
| -rw-r--r-- | unittest/sql/explain_filename-t.cc | 2 | ||||
| -rw-r--r-- | unittest/strings/strings-t.c | 14 |
4 files changed, 13 insertions, 13 deletions
diff --git a/unittest/json_lib/json_lib-t.c b/unittest/json_lib/json_lib-t.c index 11f02b204f8..378ebe201f5 100644 --- a/unittest/json_lib/json_lib-t.c +++ b/unittest/json_lib/json_lib-t.c @@ -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."); diff --git a/unittest/mysys/ma_dyncol-t.c b/unittest/mysys/ma_dyncol-t.c index 124f16e15be..d76f1b49f8f 100644 --- a/unittest/mysys/ma_dyncol-t.c +++ b/unittest/mysys/ma_dyncol-t.c @@ -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 }; diff --git a/unittest/sql/explain_filename-t.cc b/unittest/sql/explain_filename-t.cc index 859cb0cdaa4..32291d5e621 100644 --- a/unittest/sql/explain_filename-t.cc +++ b/unittest/sql/explain_filename-t.cc @@ -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 */ diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index 00d49971595..fb526477234 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -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); |