diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
| commit | b34c8645cdb301140327528a76a79a9e68c25611 (patch) | |
| tree | cb49384a1f2715f859ecea334f20bf4a46ecbcce /client/mysql.cc | |
| parent | 7772c7cd945cf674b212b82f4d156099c67344a2 (diff) | |
| parent | 65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (diff) | |
| download | mariadb-git-b-10.3-10.3-merge.tar.gz | |
Merge 10.3 into 10.4b-10.3-10.3-merge
Conflicts:
mysql-test/suite/galera/disabled.def (resolved)
mysql-test/suite/galera/r/MW-328A.result (run tests)
mysql-test/suite/innodb/r/alter_copy.result (needs check)
mysql-test/suite/innodb/t/trx_id_future.test (needs check)
sql/opt_range.cc (needs check)
sql/share/errmsg-utf8.txt (needs check)
sql/sql_parse.cc (needs check)
sql/sql_select.cc (needs check)
sql/sql_table.cc (need check)
sql/wsrep_mysqld.cc (resolved)
sql/wsrep_sst.cc (resolved)
sql/wsrep_thd.cc (resolved)
Diffstat (limited to 'client/mysql.cc')
| -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 d3d273c3a72..41b7d192fc0 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) |