Attachment #208114 for bug #241081

View | Details | Raw Unified | Return to bug 241081
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/databases/xtrabackup/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xtrabackup	4	PORTNAME= xtrabackup
5	DISTVERSION= 2.4.12	5	DISTVERSION= 2.4.15
6	PORTREVISION= 1
7	CATEGORIES= databases	6	CATEGORIES= databases
8	MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \	7	MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
9	SF/boost/boost/1.59.0/:boost	8	SF/boost/boost/1.59.0/:boost
Lines 34-40 USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \ Link Here
34	cpe gettext libtool perl5 shebangfix	33	cpe gettext libtool perl5 shebangfix
35	CPE_VENDOR= percona	34	CPE_VENDOR= percona
36	SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh	35	SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh
37	CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0	36	CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF
38		37
39	WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}	38	WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
40		39

Lines 1-5 Link Here

(-)b/databases/xtrabackup/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1533575308	1	TIMESTAMP = 1570253950
2	SHA256 (percona-xtrabackup-2.4.12.tar.gz) = de02cfd5bde96ddbf50339ef3a4646004dde52239698df45c19ed3e8ee40738e	2	SHA256 (percona-xtrabackup-2.4.15.tar.gz) = ea8e50b50ff7230220329431339a1f3d97af2365a31f2afe6533d13ff95c20db
3	SIZE (percona-xtrabackup-2.4.12.tar.gz) = 57232309	3	SIZE (percona-xtrabackup-2.4.15.tar.gz) = 57357749
4	SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca	4	SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
5	SIZE (boost_1_59_0.tar.bz2) = 70389425	5	SIZE (boost_1_59_0.tar.bz2) = 70389425

Lines 1-6 Link Here

(-)b/databases/xtrabackup/files/patch-cmake-install_layout.cmake (-1 / +1 lines)
1	--- cmake/install_layout.cmake 2017-02-06 18:02:22.189764000 +0000	1	--- cmake/install_layout.cmake 2017-02-06 18:02:22.189764000 +0000
2	+++ cmake/install_layout.cmake 2017-02-06 18:02:29.642407000 +0000	2	+++ cmake/install_layout.cmake 2017-02-06 18:02:29.642407000 +0000
3	@@ -162,7 +162,7 @@	3	@@ -160,7 +160,7 @@
4	#	4	#
5	SET(INSTALL_SHAREDIR_STANDALONE "share")	5	SET(INSTALL_SHAREDIR_STANDALONE "share")
6	SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")	6	SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")

Removed Link Here

(-)a/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc (-11 lines)
1	--- plugin/keyring/common/system_keys_container.cc.orig 2018-08-27 16:50:01 UTC
2	+++ plugin/keyring/common/system_keys_container.cc
3	@@ -125,7 +125,7 @@ void System_keys_container::store_or_upd
4	if (is_system_key_with_version(key, system_key_id, key_version))
5	{
6	if (system_key_id_to_system_key.count(system_key_id) == 0) // add a new system key
7	- system_key_id_to_system_key.insert(std::make_pair<std::string, System_key_adapter*>(system_key_id, new System_key_adapter(key_version, key)));
8	+ system_key_id_to_system_key.insert(std::make_pair(system_key_id, new System_key_adapter(key_version, key)));
9	else
10	update_system_key(key, system_key_id, key_version);
11	}

Removed Link Here

(-)a/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc (-11 lines)
1	--- storage/innobase/row/row0sel.cc.orig 2018-08-27 16:21:56 UTC
2	+++ storage/innobase/row/row0sel.cc
3	@@ -5175,7 +5175,7 @@ rec_loop:
4	reporting due to search views etc. */
5	if (prev_rec != NULL
6	&& prebuilt->m_mysql_handler->end_range != NULL
7	- && prebuilt->idx_cond == false && end_loop >= 100) {
8	+ && prebuilt->idx_cond == NULL && end_loop >= 100) {
9
10	dict_index_t* key_index = prebuilt->index;
11	bool clust_templ_for_sec = false;




--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig	2018-08-09 13:51:49 UTC
+++ storage/innobase/xtrabackup/src/CMakeLists.txt
@@ -28,13 +28,6 @@ FIND_GCRYPT()
 MYSQL_CHECK_CURL()
 FIND_EV()
 
-# xxd is needed to embed version_check script
-FIND_PROGRAM(XXD_PATH xxd)
-
-IF(NOT XXD_PATH)
-  MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.")
-ENDIF(NOT XXD_PATH)
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/storage/innobase/include
@@ -56,14 +49,6 @@ ADD_DEFINITIONS(${SSL_DEFINES})
 ########################################################################
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h )
-
-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
-                   COMMAND ${XXD_PATH} --include version_check.pl
-                   ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
-ADD_CUSTOM_TARGET(GenVersionCheck
-                  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/plugin/keyring




--- storage/innobase/xtrabackup/src/backup_copy.cc.orig	2018-08-09 14:07:34 UTC
+++ storage/innobase/xtrabackup/src/backup_copy.cc
@@ -53,7 +53,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <string>
 #include <mysqld.h>
 #include <my_default.h>
-#include <version_check_pl.h>
 #include <sstream>
 #include <algorithm>
 #include "fil_cur.h"
@@ -2296,35 +2295,4 @@ decrypt_decompress()
 	sync_check_close();
 
 	return(ret);
-}
-
-void
-version_check()
-{
-	if (opt_password != NULL) {
-		setenv("option_mysql_password", opt_password, 1);
-	}
-	if (opt_user != NULL) {
-		setenv("option_mysql_user", opt_user, 1);
-	}
-	if (opt_host != NULL) {
-		setenv("option_mysql_host", opt_host, 1);
-	}
-	if (opt_socket != NULL) {
-		setenv("option_mysql_socket", opt_socket, 1);
-	}
-	if (opt_port != 0) {
-		char port[20];
-		snprintf(port, sizeof(port), "%u", opt_port);
-		setenv("option_mysql_port", port, 1);
-	}
-
-	FILE *pipe = popen("perl", "w");
-	if (pipe == NULL) {
-		return;
-	}
-
-	fwrite((const char *) version_check_pl, version_check_pl_len, 1, pipe);
-
-	pclose(pipe);
 }




--- storage/innobase/xtrabackup/src/xtrabackup.cc.orig	2018-08-09 13:53:57 UTC
+++ storage/innobase/xtrabackup/src/xtrabackup.cc
@@ -8236,10 +8236,6 @@ xb_init()
 
 	if (xtrabackup_backup) {
 
-		if (!opt_noversioncheck) {
-			version_check();
-		}
-
 		if ((mysql_connection = xb_mysql_connect()) == NULL) {
 			return(false);
 		}

Return to bug 241081

Removed Link Here

(-)a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt (-31 lines)
1	--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig 2018-08-09 13:51:49 UTC
2	+++ storage/innobase/xtrabackup/src/CMakeLists.txt
3	@@ -28,13 +28,6 @@ FIND_GCRYPT()
4	MYSQL_CHECK_CURL()
5	FIND_EV()
6
7	-# xxd is needed to embed version_check script
8	-FIND_PROGRAM(XXD_PATH xxd)
9	-
10	-IF(NOT XXD_PATH)
11	- MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.")
12	-ENDIF(NOT XXD_PATH)
13	-
14	INCLUDE_DIRECTORIES(
15	${CMAKE_SOURCE_DIR}/include
16	${CMAKE_SOURCE_DIR}/storage/innobase/include
17	@@ -56,14 +49,6 @@ ADD_DEFINITIONS(${SSL_DEFINES})
18	########################################################################
19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in
20	${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h )
21	-
22	-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
23	- COMMAND ${XXD_PATH} --include version_check.pl
24	- ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h
25	- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
26	-
27	-ADD_CUSTOM_TARGET(GenVersionCheck
28	- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h)
29
30	INCLUDE_DIRECTORIES(
31	${CMAKE_SOURCE_DIR}/plugin/keyring

Removed Link Here

(-)a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc (-46 lines)
1	--- storage/innobase/xtrabackup/src/backup_copy.cc.orig 2018-08-09 14:07:34 UTC
2	+++ storage/innobase/xtrabackup/src/backup_copy.cc
3	@@ -53,7 +53,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
4	#include <string>
5	#include <mysqld.h>
6	#include <my_default.h>
7	-#include <version_check_pl.h>
8	#include <sstream>
9	#include <algorithm>
10	#include "fil_cur.h"
11	@@ -2296,35 +2295,4 @@ decrypt_decompress()
12	sync_check_close();
13
14	return(ret);
15	-}
16	-
17	-void
18	-version_check()
19	-{
20	- if (opt_password != NULL) {
21	- setenv("option_mysql_password", opt_password, 1);
22	- }
23	- if (opt_user != NULL) {
24	- setenv("option_mysql_user", opt_user, 1);
25	- }
26	- if (opt_host != NULL) {
27	- setenv("option_mysql_host", opt_host, 1);
28	- }
29	- if (opt_socket != NULL) {
30	- setenv("option_mysql_socket", opt_socket, 1);
31	- }
32	- if (opt_port != 0) {
33	- char port[20];
34	- snprintf(port, sizeof(port), "%u", opt_port);
35	- setenv("option_mysql_port", port, 1);
36	- }
37	-
38	- FILE *pipe = popen("perl", "w");
39	- if (pipe == NULL) {
40	- return;
41	- }
42	-
43	- fwrite((const char *) version_check_pl, version_check_pl_len, 1, pipe);
44	-
45	- pclose(pipe);
46	}

Removed Link Here

(-)a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc (-13 lines)
1	--- storage/innobase/xtrabackup/src/xtrabackup.cc.orig 2018-08-09 13:53:57 UTC
2	+++ storage/innobase/xtrabackup/src/xtrabackup.cc
3	@@ -8236,10 +8236,6 @@ xb_init()
4
5	if (xtrabackup_backup) {
6
7	- if (!opt_noversioncheck) {
8	- version_check();
9	- }
10	-
11	if ((mysql_connection = xb_mysql_connect()) == NULL) {
12	return(false);
13	}