commit 343cb080fc2628ecb4c1df96e446d176428a10e8
Author: Adam Gołębiowski <ad...@pld-linux.org>
Date: Sun May 16 10:14:31 2021 +0000
- lz4.patch and mysql-protobuf.patch no longer needed (somehow applied
upstream)
lz4.patch | 11 -----------
mysql-protobuf.patch | 12 ------------
mysql.spec | 4 ----
3 files changed, 27 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 8433afd..bbc15d8 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -61,8 +61,6 @@ Source12: %{name}-ndb-cpc.sysconfig
Source13: %{name}-client.conf
Source14: my.cnf
Patch0: %{name}-opt.patch
-Patch1: lz4.patch
-Patch2: %{name}-protobuf.patch
Patch17: %{name}-5.7-sphinx.patch
Patch18: %{name}-sphinx.patch
@@ -464,8 +462,6 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
%setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101}
#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
%if %{with sphinx}
# http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
diff --git a/lz4.patch b/lz4.patch
deleted file mode 100644
index 7b60e84..0000000
--- a/lz4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-5.7.22/extra/lz4_decompress.cc~ 2018-03-04 14:40:40.000000000
+0100
-+++ mysql-5.7.22/extra/lz4_decompress.cc 2018-06-02 00:47:44.437818669
+0200
-@@ -18,7 +18,7 @@
- #include <my_global.h>
- #include <welcome_copyright_notice.h>
-
--#include "lz4/lz4frame.h"
-+#include <lz4frame.h>
- #include <string.h>
-
- static void usage()
diff --git a/mysql-protobuf.patch b/mysql-protobuf.patch
deleted file mode 100644
index cce64d4..0000000
--- a/mysql-protobuf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
----
mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig
2019-06-10 16:43:20.000000000 +0200
-+++ mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
2019-07-29 19:19:29.421629353 +0200
-@@ -29,7 +29,9 @@
- #include <google/protobuf/io/tokenizer.h>
- #include <google/protobuf/io/zero_copy_stream.h>
- #include <google/protobuf/wire_format_lite.h>
-+#if GOOGLE_PROTOBUF_VERSION < 3008000
- #include <google/protobuf/wire_format_lite_inl.h>
-+#endif
- #include <google/protobuf/dynamic_message.h>
-
- #include "mysqlx_connection.pb.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/59703849c6a61d839055118ccd70145844a108cd
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
