X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql-readline.patch;h=ca2af0668c8745f1be45a0c7332a3ec5ddfdf1c1;hb=c19cb93d317031f20d6a3e3899d93d014a929a66;hp=ce82211f1bd6b41ca980024a233565f3f082f6e8;hpb=80b79262cb4d737c86097db72b8b68322f233d81;p=packages%2Fmysql.git

diff --git a/mysql-readline.patch b/mysql-readline.patch
index ce82211..ca2af06 100644
--- a/mysql-readline.patch
+++ b/mysql-readline.patch
@@ -1,16 +1,15 @@
-diff -ruNp mysql-5.7.21.orig/client/mysql.cc mysql-5.7.21/client/mysql.cc
---- mysql-5.7.21.orig/client/mysql.cc	2017-12-28 04:46:26.000000000 +0100
-+++ mysql-5.7.21/client/mysql.cc	2018-03-31 21:37:27.879569060 +0200
-@@ -67,6 +67,7 @@
+--- 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 <syslog.h>
  #include <readline.h>
 +#include <history.h>
+ #include <syslog.h>
+ 
  #define HAVE_READLINE
- #define USE_POPEN
- #endif
-@@ -1126,22 +1127,6 @@ static const char *embedded_server_group
- { "server", "embedded", "mysql_SERVER", 0 };
+@@ -1134,22 +1134,6 @@ static COMMANDS commands[] = {
+ static const char *load_default_groups[] = {"mysql", "client", nullptr};
  
  #ifdef HAVE_READLINE
 -/*
@@ -19,9 +18,9 @@ diff -ruNp mysql-5.7.21.orig/client/mysql.cc mysql-5.7.21/client/mysql.cc
 -*/
 -#if !defined(HAVE_HIST_ENTRY)
 -typedef struct _hist_entry {
--  const char      *line;
--  const char      *data;
--} HIST_ENTRY; 
+-  const char *line;
+-  const char *data;
+-} HIST_ENTRY;
 -#endif
 -
 -extern "C" int add_history(const char *command); /* From readline directory */
@@ -30,5 +29,5 @@ diff -ruNp mysql-5.7.21.orig/client/mysql.cc mysql-5.7.21/client/mysql.cc
 -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 */
+ static void initialize_readline(char *name);
+ #endif /* HAVE_READLINE */