Attachment #183030 for bug #219631

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




--- client/mysql.cc.orig	2017-05-29 12:49:44.423885000 +0200
+++ client/mysql.cc	2017-05-29 12:55:13.604765000 +0200
@@ -2784,9 +2784,11 @@
 #ifdef HAVE_LOCALE_H
   setlocale(LC_ALL,""); /* so as libedit use isprint */
 #endif

 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
   rl_completion_entry_function= &no_completion;
@@ -2805,7 +2807,7 @@
                                    int end MY_ATTRIBUTE((unused)))
 {
   if (!status.batch && !quick)
-#if defined(USE_NEW_XLINE_INTERFACE)
+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
     return rl_completion_matches(text, new_command_generator);
 #else




--- CMakeLists.txt.orig	2017-05-29 12:44:32.006353000 +0200
+++ CMakeLists.txt	2017-05-29 12:46:55.502845000 +0200
@@ -486,42 +486,17 @@
 
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)

-  ADD_SUBDIRECTORY(packaging/rpm-fedora)
-  ADD_SUBDIRECTORY(packaging/rpm-sles)
-  ADD_SUBDIRECTORY(packaging/rpm-docker)
-  ADD_SUBDIRECTORY(packaging/deb-in)
-ENDIF()
-
 INCLUDE(cmake/abi_check.cmake)
 INCLUDE(cmake/tags.cmake)
 
@@ -558,18 +533,17 @@
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -591,6 +565,7 @@
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()
+ENDIF()
 
 INCLUDE(CPack)
 

Lines 1-6 Link Here

(-)percona56-client/files/patch-support-files_CMakeLists.txt (-5 / +9 lines)
1	--- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100	1	--- support-files/CMakeLists.txt.orig 2017-05-09 08:31:39.000000000 +0200
2	+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100	2	+++ support-files/CMakeLists.txt 2017-05-29 13:10:29.832994000 +0200
3	@@ -44,14 +44,17 @@	3	@@ -44,11 +44,13 @@
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
5	ENDIF()	5	ENDIF()
6		6
Lines 13-24 Link Here
13	+ENDIF()	13	+ENDIF()
14		14
15	IF(UNIX)	15	IF(UNIX)
		16	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
		17	@@ -57,6 +59,7 @@
		18	SET (PIDOF "pgrep -d' ' -f")
		19	ENDIF()
16	SET(prefix ${CMAKE_INSTALL_PREFIX})	20	SET(prefix ${CMAKE_INSTALL_PREFIX})
17	+IF(FALSE)	21	+IF(FALSE)
18	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)	22	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	23	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
20	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	24	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
21	@@ -68,8 +71,10 @@	25	@@ -73,8 +76,10 @@
22	IF(INSTALL_SUPPORTFILESDIR)	26	IF(INSTALL_SUPPORTFILESDIR)
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	27	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
24	ENDIF()	28	ENDIF()
Lines 29-35 Link Here
29	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	33	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
30	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	34	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
31		35
32	@@ -94,3 +99,4 @@	36	@@ -99,3 +104,4 @@
33	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	37	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
34	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	38	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
35	ENDIF()	39	ENDIF()

Lines 1-3 Link Here

(-)percona56-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1489419333	1	TIMESTAMP = 1496051683
2	SHA256 (percona-server-5.6.35-80.0.tar.gz) = 259b5aa2c6218958c8cc55170b9381955ea60445127bf46e02aa09903af7f26b	2	SHA256 (percona-server-5.6.36-82.0.tar.gz) = 4304ac45de79053128fb78f13527f483ec9cf1c9592498deeacbbe541216fc9d
3	SIZE (percona-server-5.6.35-80.0.tar.gz) = 55839147	3	SIZE (percona-server-5.6.36-82.0.tar.gz) = 56116691




--- client/mysql.cc.orig	2017-05-09 08:31:39.000000000 +0200
+++ client/mysql.cc	2017-05-29 13:24:38.665722000 +0200
@@ -2784,9 +2784,11 @@
 #ifdef HAVE_LOCALE_H
   setlocale(LC_ALL,""); /* so as libedit use isprint */
 #endif

 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
   rl_completion_entry_function= &no_completion;
@@ -2805,7 +2807,7 @@
                                    int end MY_ATTRIBUTE((unused)))
 {
   if (!status.batch && !quick)
-#if defined(USE_NEW_XLINE_INTERFACE)
+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
     return rl_completion_matches(text, new_command_generator);
 #else

Lines 2-8 Link Here

(-)percona56-server/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/databases/percona56-server/Makefile 441395 2017-05-21 13:21:04Z linimon $	2	# $FreeBSD: head/databases/percona56-server/Makefile 441395 2017-05-21 13:21:04Z linimon $
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.6.35-80.0	5	DISTVERSION= 5.6.36-82.0
6	PORTREVISION?= 1	6	PORTREVISION?= 1
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/	8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/

Return to bug 219631

Lines 1-6 Link Here

(-)percona56-client/files/patch-client_mysql.cc (-5 / +5 lines)
1	--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC	1	--- client/mysql.cc.orig 2017-05-29 12:49:44.423885000 +0200
2	+++ client/mysql.cc	2	+++ client/mysql.cc 2017-05-29 12:55:13.604765000 +0200
3	@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n	3	@@ -2784,9 +2784,11 @@
4	#ifdef HAVE_LOCALE_H	4	#ifdef HAVE_LOCALE_H
5	setlocale(LC_ALL,""); /* so as libedit use isprint */	5	setlocale(LC_ALL,""); /* so as libedit use isprint */
6	#endif	6	#endif
Lines 14-24 Link Here
14	#else	14	#else
15	rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;	15	rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
16	rl_completion_entry_function= &no_completion;	16	rl_completion_entry_function= &no_completion;
17	@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const	17	@@ -2805,7 +2807,7 @@
18	int end MY_ATTRIBUTE((unused)))	18	int end MY_ATTRIBUTE((unused)))
19	{	19	{
20	if (!status.batch && !quick)	20	if (!status.batch && !quick)
21	-#if defined(USE_NEW_READLINE_INTERFACE)	21	-#if defined(USE_NEW_XLINE_INTERFACE)
22	+#if defined(USE_NEW_READLINE_INTERFACE) \|\| defined(USE_LIBEDIT_INTERFACE)	22	+#if defined(USE_NEW_READLINE_INTERFACE) \|\| defined(USE_LIBEDIT_INTERFACE)
23	return rl_completion_matches(text, new_command_generator);	23	return rl_completion_matches(text, new_command_generator);
24	#else	24	#else

Lines 1-6 Link Here

(-)percona56-client/files/patch-CMakeLists.txt (-5 / +7 lines)
1	--- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200	1	--- CMakeLists.txt.orig 2017-05-29 12:44:32.006353000 +0200
2	+++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200	2	+++ CMakeLists.txt 2017-05-29 12:46:55.502845000 +0200
3	@@ -471,41 +471,17 @@	3	@@ -486,42 +486,17 @@
4		4
5	ADD_SUBDIRECTORY(extra)	5	ADD_SUBDIRECTORY(extra)
6	ADD_SUBDIRECTORY(client)	6	ADD_SUBDIRECTORY(client)
Lines 38-49 Link Here
38	- ADD_SUBDIRECTORY(packaging/rpm-fedora)	38	- ADD_SUBDIRECTORY(packaging/rpm-fedora)
39	- ADD_SUBDIRECTORY(packaging/rpm-sles)	39	- ADD_SUBDIRECTORY(packaging/rpm-sles)
40	- ADD_SUBDIRECTORY(packaging/rpm-docker)	40	- ADD_SUBDIRECTORY(packaging/rpm-docker)
		41	- ADD_SUBDIRECTORY(packaging/deb-in)
41	-ENDIF()	42	-ENDIF()
42	-	43	-
43	INCLUDE(cmake/abi_check.cmake)	44	INCLUDE(cmake/abi_check.cmake)
44	INCLUDE(cmake/tags.cmake)	45	INCLUDE(cmake/tags.cmake)
45		46
46	@@ -542,18 +518,17 @@	47	@@ -558,18 +533,17 @@
47	SET(CPACK_GENERATOR "TGZ")	48	SET(CPACK_GENERATOR "TGZ")
48	ENDIF()	49	ENDIF()
49	ADD_SUBDIRECTORY(packaging/WiX)	50	ADD_SUBDIRECTORY(packaging/WiX)
Lines 63-72 Link Here
63	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	64	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
64	INSTALL(FILES COPYING LICENSE.mysql	65	INSTALL(FILES COPYING LICENSE.mysql
65	DESTINATION ${INSTALL_DOCREADMEDIR}	66	DESTINATION ${INSTALL_DOCREADMEDIR}
66	@@ -579,6 +554,7 @@	67	@@ -591,6 +565,7 @@
67	PATTERN "sp-imp-spec.txt" EXCLUDE	68	PATTERN "sp-imp-spec.txt" EXCLUDE
68	)	69	)
69	ENDIF()	70	ENDIF()
70	+ENDIF()	71	+ENDIF()
71		72
72	INCLUDE(CPack)	73	INCLUDE(CPack)
		74

Lines 1-6 Link Here

(-)percona56-server/files/patch-client_mysql.cc (-5 / +5 lines)
1	--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC	1	--- client/mysql.cc.orig 2017-05-09 08:31:39.000000000 +0200
2	+++ client/mysql.cc	2	+++ client/mysql.cc 2017-05-29 13:24:38.665722000 +0200
3	@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n	3	@@ -2784,9 +2784,11 @@
4	#ifdef HAVE_LOCALE_H	4	#ifdef HAVE_LOCALE_H
5	setlocale(LC_ALL,""); /* so as libedit use isprint */	5	setlocale(LC_ALL,""); /* so as libedit use isprint */
6	#endif	6	#endif
Lines 14-24 Link Here
14	#else	14	#else
15	rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;	15	rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
16	rl_completion_entry_function= &no_completion;	16	rl_completion_entry_function= &no_completion;
17	@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const	17	@@ -2805,7 +2807,7 @@
18	int end MY_ATTRIBUTE((unused)))	18	int end MY_ATTRIBUTE((unused)))
19	{	19	{
20	if (!status.batch && !quick)	20	if (!status.batch && !quick)
21	-#if defined(USE_NEW_READLINE_INTERFACE)	21	-#if defined(USE_NEW_XLINE_INTERFACE)
22	+#if defined(USE_NEW_READLINE_INTERFACE) \|\| defined(USE_LIBEDIT_INTERFACE)	22	+#if defined(USE_NEW_READLINE_INTERFACE) \|\| defined(USE_LIBEDIT_INTERFACE)
23	return rl_completion_matches(text, new_command_generator);	23	return rl_completion_matches(text, new_command_generator);
24	#else	24	#else