X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql-readline.patch;h=ca2af0668c8745f1be45a0c7332a3ec5ddfdf1c1;hb=3d50e2758dbfc455bf21de1c2ff151a3745f887f;hp=ed12c3af0b259050642af4bf2a127b54cd1409f1;hpb=5d87e23e83778b780ea870de884296569fd5b127;p=packages%2Fmysql.git

diff --git a/mysql-readline.patch b/mysql-readline.patch
index ed12c3a..ca2af06 100644
--- a/mysql-readline.patch
+++ b/mysql-readline.patch
@@ -1,21 +1,33 @@
---- Percona-Server-5.6.15-rel63.0/client/mysql.cc.orig	2014-02-09 06:23:16.085128298 +0100
-+++ Percona-Server-5.6.15-rel63.0/client/mysql.cc	2014-02-09 06:38:54.561791068 +0100
-@@ -103,7 +103,9 @@
- #include <conio.h>
+--- mysql-8.0.20/client/mysql.cc~	2020-05-12 19:39:17.000000000 +0200
++++ mysql-8.0.20/client/mysql.cc	2020-05-12 19:49:31.903300850 +0200
+@@ -79,6 +79,7 @@
+ #define LOG_USER 0
  #else
  #include <readline.h>
 +#include <history.h>
+ #include <syslog.h>
+ 
  #define HAVE_READLINE
-+#define USE_NEW_READLINE_INTERFACE
- #define USE_POPEN
- #endif
-   //int vidattr(long unsigned int attrs);	// Was missing in sun curses
-@@ -1107,7 +1109,7 @@
- } HIST_ENTRY; 
- #endif
+@@ -1134,22 +1134,6 @@ static COMMANDS commands[] = {
+ static const char *load_default_groups[] = {"mysql", "client", nullptr};
  
+ #ifdef HAVE_READLINE
+-/*
+- HIST_ENTRY is defined for libedit, but not for the real readline
+- Need to redefine it for real readline to find it
+-*/
+-#if !defined(HAVE_HIST_ENTRY)
+-typedef struct _hist_entry {
+-  const char *line;
+-  const char *data;
+-} HIST_ENTRY;
+-#endif
+-
 -extern "C" int add_history(const char *command); /* From readline directory */
-+extern "C" void add_history(const char *command); /* From readline directory */
- extern "C" int read_history(const char *command);
- extern "C" int write_history(const char *command);
- extern "C" HIST_ENTRY *history_get(int num);
+-extern "C" int read_history(const char *command);
+-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);
+ #endif /* HAVE_READLINE */