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 /libmysqld | |
| parent | 323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff) | |
| download | mariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz | |
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index f59163eb6a8..34126c50bc9 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -297,7 +297,7 @@ mysql_stmt_next_result # Charsets my_charset_bin my_charset_latin1 -my_charset_utf8_general_ci +my_charset_utf8mb3_general_ci # Client plugins mysql_client_find_plugin mysql_client_register_plugin diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 80fd79ae56b..b0fb6054a97 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -559,7 +559,7 @@ int init_embedded_server(int argc, char **argv, char **groups) remaining_argv= *argvp; /* Must be initialized early for comparison of options name */ - system_charset_info= &my_charset_utf8_general_ci; + system_charset_info= &my_charset_utf8mb3_general_ci; sys_var_init(); int ho_error= handle_early_options(); |