]>
Commit | Line | Data |
---|---|---|
bd62a2c5 AO |
1 | diff -ruNp mysql-5.7.21.orig/client/mysql.cc mysql-5.7.21/client/mysql.cc |
2 | --- mysql-5.7.21.orig/client/mysql.cc 2017-12-28 04:46:26.000000000 +0100 | |
3 | +++ mysql-5.7.21/client/mysql.cc 2018-03-31 21:37:27.879569060 +0200 | |
4 | @@ -67,6 +67,7 @@ | |
5 | #else | |
6 | #include <syslog.h> | |
7 | #include <readline.h> | |
8 | +#include <history.h> | |
9 | #define HAVE_READLINE | |
10 | #define USE_POPEN | |
11 | #endif | |
12 | @@ -1126,22 +1127,6 @@ static const char *embedded_server_group | |
13 | { "server", "embedded", "mysql_SERVER", 0 }; | |
14 | ||
15 | #ifdef HAVE_READLINE | |
16 | -/* | |
17 | - HIST_ENTRY is defined for libedit, but not for the real readline | |
18 | - Need to redefine it for real readline to find it | |
19 | -*/ | |
20 | -#if !defined(HAVE_HIST_ENTRY) | |
21 | -typedef struct _hist_entry { | |
22 | - const char *line; | |
23 | - const char *data; | |
24 | -} HIST_ENTRY; | |
25 | -#endif | |
26 | - | |
27 | -extern "C" int add_history(const char *command); /* From readline directory */ | |
28 | -extern "C" int read_history(const char *command); | |
29 | -extern "C" int write_history(const char *command); | |
30 | -extern "C" HIST_ENTRY *history_get(int num); | |
31 | -extern "C" int history_length; | |
32 | static int not_in_history(const char *line); | |
33 | static void initialize_readline (char *name); | |
34 | #endif /* HAVE_READLINE */ |