diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
| commit | 67ddb6507d58b08f88dfede96b057eae34d9d76e (patch) | |
| tree | 5f28ca11d7940d4fc17b6b9182eda27bae88e70f /client | |
| parent | 6073049a3675363f7d7efe26f47525b528be9e2f (diff) | |
| parent | c221bcdce7714a74b89a02de941e8d8df2994ce3 (diff) | |
| download | mariadb-git-67ddb6507d58b08f88dfede96b057eae34d9d76e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index d533a66e841..b881773e1f8 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1059,7 +1059,7 @@ extern "C" int write_history(const char *command); extern "C" HIST_ENTRY *history_get(int num); extern "C" int history_length; static int not_in_history(const char *line); -static void initialize_readline (char *name); +static void initialize_readline (); static void fix_history(String *final_command); #endif @@ -1240,7 +1240,7 @@ int main(int argc,char *argv[]) } #ifdef HAVE_READLINE - initialize_readline((char*) my_progname); + initialize_readline(); if (!status.batch && !quick && !opt_html && !opt_xml) { /* read-history from file, default ~/.mysql_history*/ @@ -2665,10 +2665,11 @@ static int fake_magic_space(const char *, int) } -static void initialize_readline (char *name) +static void initialize_readline () { /* Allow conditional parsing of the ~/.inputrc file. */ - rl_readline_name = name; + rl_readline_name= "mysql"; + rl_terminal_name= getenv("TERM"); /* Tell the completer that we want a crack first. */ #if defined(USE_NEW_READLINE_INTERFACE) |