View | Details | Raw Unified | Return to bug 206998 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-client/Makefile (-1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
2
# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTREVISION?=	4
6
PKGNAMESUFFIX=	57-client
5
PKGNAMESUFFIX=	57-client
7
6
8
COMMENT=	Multithreaded SQL database (client)
7
COMMENT=	Multithreaded SQL database (client)
(-)mysql57-client/files/patch-CMakeLists.txt (-3 / +3 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -569,8 +569,8 @@ ENDIF()
3
@@ -579,8 +579,8 @@ ENDIF()
4
 
4
 
5
 ADD_SUBDIRECTORY(extra)
5
 ADD_SUBDIRECTORY(extra)
6
 ADD_SUBDIRECTORY(client)
6
 ADD_SUBDIRECTORY(client)
Lines 10-16 Link Here
10
 
10
 
11
 IF(UNIX)
11
 IF(UNIX)
12
   ADD_SUBDIRECTORY(man)
12
   ADD_SUBDIRECTORY(man)
13
@@ -639,14 +639,13 @@ ELSE()
13
@@ -653,14 +653,13 @@ ELSE()
14
   SET(CPACK_GENERATOR "TGZ")
14
   SET(CPACK_GENERATOR "TGZ")
15
 ENDIF() 
15
 ENDIF() 
16
 ADD_SUBDIRECTORY(packaging/WiX)
16
 ADD_SUBDIRECTORY(packaging/WiX)
Lines 26-32 Link Here
26
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
26
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
27
   INSTALL(FILES COPYING LICENSE.mysql 
27
   INSTALL(FILES COPYING LICENSE.mysql 
28
   DESTINATION ${INSTALL_DOCREADMEDIR} 
28
   DESTINATION ${INSTALL_DOCREADMEDIR} 
29
@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
29
@@ -683,6 +682,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
30
     PATTERN "sp-imp-spec.txt" EXCLUDE
30
     PATTERN "sp-imp-spec.txt" EXCLUDE
31
   )
31
   )
32
 ENDIF()
32
 ENDIF()
(-)mysql57-client/files/patch-client_CMakeLists.txt (-5 / +5 lines)
Lines 1-6 Link Here
1
--- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ client/CMakeLists.txt
2
+++ client/CMakeLists.txt
3
@@ -121,6 +121,7 @@ IF(UNIX)
3
@@ -47,6 +47,7 @@ IF(UNIX)
4
   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
4
   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
5
 ENDIF(UNIX)
5
 ENDIF(UNIX)
6
 
6
 
Lines 8-14 Link Here
8
 IF(NOT WITHOUT_SERVER)
8
 IF(NOT WITHOUT_SERVER)
9
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
9
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
10
     upgrade/program.cc
10
     upgrade/program.cc
11
@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
11
@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
12
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
12
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
13
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
13
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
14
 ENDIF()
14
 ENDIF()
Lines 22-28 Link Here
22
 
22
 
23
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
23
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
24
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
24
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
25
@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
25
@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
26
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
26
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
27
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
27
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
28
 
28
 
Lines 33-39 Link Here
33
 
33
 
34
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
34
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
35
 ADD_COMPILE_FLAGS(
35
 ADD_COMPILE_FLAGS(
36
@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
36
@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
37
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
37
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
38
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
38
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
39
 
39
 
Lines 44-50 Link Here
44
 
44
 
45
 IF(UNIX AND NOT WITHOUT_SERVER)
45
 IF(UNIX AND NOT WITHOUT_SERVER)
46
   MYSQL_ADD_EXECUTABLE(mysql_install_db
46
   MYSQL_ADD_EXECUTABLE(mysql_install_db
47
@@ -196,7 +204,6 @@ IF(WIN32)
47
@@ -122,7 +130,6 @@ IF(WIN32)
48
 ENDIF(WIN32)
48
 ENDIF(WIN32)
49
 
49
 
50
 SET_TARGET_PROPERTIES (
50
 SET_TARGET_PROPERTIES (
(-)mysql57-client/files/patch-include_CMakeLists.txt (-2 / +1 lines)
Lines 1-6 Link Here
1
--- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ include/CMakeLists.txt
2
+++ include/CMakeLists.txt
3
@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
3
@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
4
 
4
 
5
 SET(HEADERS 
5
 SET(HEADERS 
6
   ${HEADERS_ABI} 
6
   ${HEADERS_ABI} 
Lines 8-11 Link Here
8
   my_dbug.h 
8
   my_dbug.h 
9
   m_string.h
9
   m_string.h
10
   my_sys.h 
10
   my_sys.h 
11
(-)mysql57-client/pkg-plist (+4 lines)
Lines 53-58 Link Here
53
include/mysql/mysql/plugin_ftparser.h
53
include/mysql/mysql/plugin_ftparser.h
54
include/mysql/mysql/plugin_ftparser.h.pp
54
include/mysql/mysql/plugin_ftparser.h.pp
55
include/mysql/mysql/plugin_group_replication.h
55
include/mysql/mysql/plugin_group_replication.h
56
include/mysql/mysql/plugin_keyring.h
57
include/mysql/mysql/plugin_keyring.h.pp
56
include/mysql/mysql/plugin_trace.h
58
include/mysql/mysql/plugin_trace.h
57
include/mysql/mysql/plugin_validate_password.h
59
include/mysql/mysql/plugin_validate_password.h
58
include/mysql/mysql/psi/mysql_file.h
60
include/mysql/mysql/psi/mysql_file.h
Lines 75-80 Link Here
75
include/mysql/mysql/service_my_plugin_log.h
77
include/mysql/mysql/service_my_plugin_log.h
76
include/mysql/mysql/service_my_snprintf.h
78
include/mysql/mysql/service_my_snprintf.h
77
include/mysql/mysql/service_mysql_alloc.h
79
include/mysql/mysql/service_mysql_alloc.h
80
include/mysql/mysql/service_mysql_keyring.h
78
include/mysql/mysql/service_mysql_password_policy.h
81
include/mysql/mysql/service_mysql_password_policy.h
79
include/mysql/mysql/service_mysql_string.h
82
include/mysql/mysql/service_mysql_string.h
80
include/mysql/mysql/service_parser.h
83
include/mysql/mysql/service_parser.h
Lines 103-108 Link Here
103
include/mysql/plugin_audit.h
106
include/mysql/plugin_audit.h
104
include/mysql/plugin_ftparser.h
107
include/mysql/plugin_ftparser.h
105
include/mysql/plugin_group_replication.h
108
include/mysql/plugin_group_replication.h
109
include/mysql/plugin_keyring.h
106
include/mysql/plugin_validate_password.h
110
include/mysql/plugin_validate_password.h
107
include/mysql/sql_common.h
111
include/mysql/sql_common.h
108
include/mysql/sql_state.h
112
include/mysql/sql_state.h
(-)mysql57-server/Makefile (-8 / +7 lines)
Lines 2-13 Link Here
2
# $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $
2
# $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTVERSION=	5.7.10
5
PORTVERSION=	5.7.11
6
PORTREVISION?=	4
7
CATEGORIES=	databases ipv6
6
CATEGORIES=	databases ipv6
8
MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
7
MASTER_SITES=	MYSQL/MySQL-5.7
9
PKGNAMESUFFIX?=	57-server
8
PKGNAMESUFFIX?=	57-server
10
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost
9
DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
10
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
11
11
12
MAINTAINER=	mokhi64@gmail.com
12
MAINTAINER=	mokhi64@gmail.com
13
COMMENT=	Multithreaded SQL database (server)
13
COMMENT=	Multithreaded SQL database (server)
Lines 28-34 Link Here
28
BUNDLED_ZLIB_DESC=	Use bundled ZLib
28
BUNDLED_ZLIB_DESC=	Use bundled ZLib
29
SYSTEM_ZLIB_DESC=	Use system ZLib
29
SYSTEM_ZLIB_DESC=	Use system ZLib
30
30
31
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
31
CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
32
		-DINSTALL_DOCDIR="share/doc/mysql" \
32
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
33
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
33
		-DINSTALL_INCLUDEDIR="include/mysql" \
34
		-DINSTALL_INCLUDEDIR="include/mysql" \
34
		-DINSTALL_INFODIR="info" \
35
		-DINSTALL_INFODIR="info" \
Lines 43-51 Link Here
43
		-DINSTALL_SCRIPTDIR="bin" \
44
		-DINSTALL_SCRIPTDIR="bin" \
44
		-DINSTALL_SHAREDIR="share" \
45
		-DINSTALL_SHAREDIR="share" \
45
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
46
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
46
		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
47
		-DWITH_BOOST=${WRKSRC}/boost \
47
		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
48
		-DINSTALL_LAYOUT=STANDALONE \
49
		-DWITH_INNODB_EXTRA_DEBUG=0
48
		-DWITH_INNODB_EXTRA_DEBUG=0
50
49
51
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
50
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
(-)mysql57-server/distinfo (-4 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74
1
SHA256 (mysql-boost-5.7.11.tar.gz) = ab21347ba004a5aa349b911d829a14e79b1e36e4bcd007d39d75212071414e28
2
SIZE (mysql-5.7.10.tar.gz) = 48919371
2
SIZE (mysql-boost-5.7.11.tar.gz) = 59225677
3
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
4
SIZE (boost_1_59_0.tar.gz) = 83709983
(-)mysql57-server/files/patch-CMakeLists.txt (-4 / +4 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -577,12 +577,10 @@ IF(UNIX)
3
@@ -587,12 +587,10 @@ IF(UNIX)
4
 ENDIF()
4
 ENDIF()
5
 
5
 
6
 IF(NOT WITHOUT_SERVER)
6
 IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13
   ENDIF(WITH_EMBEDDED_SERVER)
13
   ENDIF(WITH_EMBEDDED_SERVER)
14
 ENDIF()
14
 ENDIF()
15
 
15
 
16
@@ -591,8 +589,6 @@ ENDIF()
16
@@ -601,8 +599,6 @@ ENDIF()
17
 ADD_SUBDIRECTORY(scripts)
17
 ADD_SUBDIRECTORY(scripts)
18
 
18
 
19
 IF(NOT WITHOUT_SERVER)
19
 IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22
   ADD_SUBDIRECTORY(support-files)
22
   ADD_SUBDIRECTORY(support-files)
23
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
23
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24
     ADD_SUBDIRECTORY(internal)
24
     ADD_SUBDIRECTORY(internal)
25
@@ -647,6 +643,7 @@ ENDIF()
25
@@ -661,6 +657,7 @@ ENDIF()
26
 #
26
 #
27
 # RPM installs documentation directly from the source tree
27
 # RPM installs documentation directly from the source tree
28
 #
28
 #
Lines 30-36 Link Here
30
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
30
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31
   INSTALL(FILES COPYING LICENSE.mysql 
31
   INSTALL(FILES COPYING LICENSE.mysql 
32
   DESTINATION ${INSTALL_DOCREADMEDIR} 
32
   DESTINATION ${INSTALL_DOCREADMEDIR} 
33
@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
33
@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34
     PATTERN "sp-imp-spec.txt" EXCLUDE
34
     PATTERN "sp-imp-spec.txt" EXCLUDE
35
   )
35
   )
36
 ENDIF()
36
 ENDIF()
(-)mysql57-server/files/patch-client_CMakeLists.txt (-8 / +8 lines)
Lines 1-6 Link Here
1
--- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ client/CMakeLists.txt
2
+++ client/CMakeLists.txt
3
@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
3
@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
4
 
4
 
5
 ## Subdirectory with common client code.
5
 ## Subdirectory with common client code.
6
 ADD_SUBDIRECTORY(base)
6
 ADD_SUBDIRECTORY(base)
Lines 9-16 Link Here
9
 
9
 
10
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
10
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
11
 COPY_OPENSSL_DLLS(copy_openssl_client)
11
 COPY_OPENSSL_DLLS(copy_openssl_client)
12
@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
12
@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13
 ENDIF()
13
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14
 
14
 
15
 ADD_DEFINITIONS(${SSL_DEFINES})
15
 ADD_DEFINITIONS(${SSL_DEFINES})
16
+IF(FALSE)
16
+IF(FALSE)
Lines 23-29 Link Here
23
 
23
 
24
 IF(NOT WITHOUT_SERVER)
24
 IF(NOT WITHOUT_SERVER)
25
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
25
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
26
@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
26
@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
27
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
27
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
28
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
29
 
29
 
Lines 31-37 Link Here
31
 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
31
 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
32
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33
 
33
 
34
@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
34
@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
35
 
35
 
36
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
36
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
37
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 44-50 Link Here
44
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
44
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45
 ADD_COMPILE_FLAGS(
45
 ADD_COMPILE_FLAGS(
46
   mysqlbinlog.cc
46
   mysqlbinlog.cc
47
@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
47
@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
48
 
48
 
49
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
49
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
50
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 52-58 Link Here
52
 
52
 
53
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
53
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
54
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
54
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
55
@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
55
@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
56
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
56
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
57
 ENDIF()
57
 ENDIF()
58
 
58
 
Lines 64-70 Link Here
64
 
64
 
65
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
65
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
66
 IF(WIN32)
66
 IF(WIN32)
67
@@ -197,11 +203,6 @@ ENDIF(WIN32)
67
@@ -123,11 +129,6 @@ ENDIF(WIN32)
68
 
68
 
69
 SET_TARGET_PROPERTIES (
69
 SET_TARGET_PROPERTIES (
70
   mysql_plugin
70
   mysql_plugin
(-)mysql57-server/files/patch-include_CMakeLists.txt (-5 / +7 lines)
Lines 1-12 Link Here
1
--- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
1
--- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
2
+++ include/CMakeLists.txt
2
+++ include/CMakeLists.txt
3
@@ -69,10 +69,12 @@ SET(HEADERS 
3
@@ -69,6 +69,7 @@ SET(HEADERS 
4
   ${HEADERS_GEN_CONFIGURE}
4
 )
5
 )
5
6
 
6
+IF(FALSE) 
7
+IF(FALSE) 
7
 INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
8
 INSTALL(FILES
8
 INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
9
   ../libbinlogevents/export/binary_log_types.h
9
 INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
10
   DESTINATION ${INSTALL_INCLUDEDIR}
11
@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
10
  PATTERN "*.h"
12
  PATTERN "*.h"
11
  PATTERN "psi_abi*" EXCLUDE
13
  PATTERN "psi_abi*" EXCLUDE
12
 )
14
 )
(-)mysql57-server/files/patch-sql_sys__vars.cc (-3 / +3 lines)
Lines 9-15 Link Here
9
 
9
 
10
 static Sys_var_ulong Sys_join_buffer_size(
10
 static Sys_var_ulong Sys_join_buffer_size(
11
        "join_buffer_size",
11
        "join_buffer_size",
12
@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou
12
@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_read_timeou
13
        "Number of seconds to wait for more data from a connection before "
13
        "Number of seconds to wait for more data from a connection before "
14
        "aborting the read",
14
        "aborting the read",
15
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
15
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
18
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19
        ON_UPDATE(fix_net_read_timeout));
19
        ON_UPDATE(fix_net_read_timeout));
20
 
20
 
21
@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo
21
@@ -2584,7 +2584,7 @@ static Sys_var_ulong Sys_net_write_timeo
22
        "Number of seconds to wait for a block to be written to a connection "
22
        "Number of seconds to wait for a block to be written to a connection "
23
        "before aborting the write",
23
        "before aborting the write",
24
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
24
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-33 Link Here
27
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
27
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28
        ON_UPDATE(fix_net_write_timeout));
28
        ON_UPDATE(fix_net_write_timeout));
29
 
29
 
30
@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou
30
@@ -4034,7 +4034,7 @@ static Sys_var_ulong Sys_net_wait_timeou
31
        "The number of seconds the server waits for activity on a "
31
        "The number of seconds the server waits for activity on a "
32
        "connection before closing it",
32
        "connection before closing it",
33
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
33
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
(-)mysql57-server/pkg-plist (+1 lines)
Lines 25-30 Link Here
25
lib/mysql/plugin/auth_test_plugin.so
25
lib/mysql/plugin/auth_test_plugin.so
26
lib/mysql/plugin/daemon_example.ini
26
lib/mysql/plugin/daemon_example.ini
27
%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
27
%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
28
lib/mysql/plugin/keyring_file.so
28
lib/mysql/plugin/libdaemon_example.so
29
lib/mysql/plugin/libdaemon_example.so
29
lib/mysql/plugin/libtest_framework.so
30
lib/mysql/plugin/libtest_framework.so
30
lib/mysql/plugin/libtest_services.so
31
lib/mysql/plugin/libtest_services.so

Return to bug 206998