diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
| commit | 3bb36e949534fc4a24d68d4297663ae8b80ba336 (patch) | |
| tree | 09907f6c2e82d718f261323075ffb33cb350fef7 /client/mysql.cc | |
| parent | 9a897335eb4387980aed7698b832a893dbaa3d81 (diff) | |
| parent | bd935a41060199a17019453d6e187e8edd7929ba (diff) | |
| download | mariadb-git-3bb36e949534fc4a24d68d4297663ae8b80ba336.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index c3a8d8b76b8..1f2ab2a79e6 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -42,7 +42,7 @@ #include <violite.h> #include <my_sys.h> #include <source_revision.h> -#if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H) +#if defined(HAVE_LOCALE_H) #include <locale.h> #endif @@ -2681,6 +2681,9 @@ static void initialize_readline () /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name= (char *) "mysql"; rl_terminal_name= getenv("TERM"); +#ifdef HAVE_SETLOCALE + setlocale(LC_ALL,""); +#endif /* Tell the completer that we want a crack first. */ #if defined(USE_NEW_READLINE_INTERFACE) @@ -2689,9 +2692,6 @@ static void initialize_readline () rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1); #elif defined(USE_LIBEDIT_INTERFACE) -#ifdef HAVE_LOCALE_H - setlocale(LC_ALL,""); /* so as libedit use isprint */ -#endif rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; rl_completion_entry_function= &no_completion; rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); |