diff options
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 8326b5da2df..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(); @@ -891,13 +891,6 @@ static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length, } -static char *dup_str_aux(MEM_ROOT *root, const char *from, - CHARSET_INFO *fromcs, CHARSET_INFO *tocs) -{ - return dup_str_aux(root, from, (uint) strlen(from), fromcs, tocs); -} - - static char *dup_str_aux(MEM_ROOT *root, const LEX_CSTRING &from, CHARSET_INFO *fromcs, CHARSET_INFO *tocs) { |