1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
7 SDESC[standard]= Multithreaded SQL database (server)
8 HOMEPAGE= https://www.mysql.com/
12 SITES[main]= MYSQL/MySQL-5.7
13 DISTFILE[1]= mysql-boost-5.7.21.tar.gz:main
15 SPKGS[standard]= complete
19 OPTIONS_AVAILABLE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
20 PARTITION PERFSCHEMA PERFORMANCE
21 OPTIONS_STANDARD= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
22 PARTITION PERFSCHEMA PERFORMANCE
23 OPTGROUP_UNLIMITED= STORAGE
24 OPTDESCR[STORAGE]= Storage engines statically compiled into server
25 OPTGROUP[STORAGE]= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE
27 OPT_ON[all]= PERFORMANCE
29 BUILD_DEPENDS= rpcgen:single:standard
30 libedit:single:standard
31 BUILDRUN_DEPENDS= libevent:single:standard
33 EXRUN[client]= libedit:single:standard
34 zlib:complete:standard
38 USERGROUP_SPKG= server
40 USES= bison cmake:outsource perl:run shebangfix ssl:build
41 c++:server,client cclibs:server,client
43 DISTNAME= mysql-5.7.21
47 LICENSE_FILE= GPLv2:{{WRKSRC}}/README
49 CMAKE_BUILD_TYPE= Release
50 FPC_EQUIVALENT= databases/mysql57-server
51 SHEBANG_FILES= scripts/*.pl
53 INSTALL_REQ_TOOLCHAIN= yes
54 PLIST_SUB= MY_DBDIR=/var/db/mysql
55 MY_SECDIR=/var/db/mysql_secure
56 MY_TMPDIR=/var/db/mysql_tmpdir
57 RC_SUBR= mysql-server:server
58 SUB_FILES= my.cnf.sample
59 SUB_LIST= MY_DBDIR=/var/db/mysql
60 MY_SECDIR=/var/db/mysql_secure
61 MY_TMPDIR=/var/db/mysql_tmpdir
63 CFLAGS= -Wno-deprecated-declarations
64 CMAKE_ARGS= -DINSTALL_PKGCONFIGDIR="{{LOCALBASE}}/lib/pkgconfig"
65 -DINSTALL_DOCDIR="share/doc/mysql"
66 -DINSTALL_DOCREADMEDIR="share/doc/mysql"
67 -DINSTALL_INCLUDEDIR="include/mysql"
68 -DINSTALL_INFODIR="share/info"
69 -DINSTALL_LIBDIR="lib/mysql"
70 -DINSTALL_MANDIR="share/man"
71 -DINSTALL_MYSQLDATADIR="/var/db/mysql"
72 -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring"
73 -DINSTALL_MYSQLSHAREDIR="share/mysql"
74 -DINSTALL_MYSQLTESTDIR="share/mysql/tests"
75 -DINSTALL_PLUGINDIR="lib/mysql/plugin"
76 -DINSTALL_SBINDIR="libexec"
77 -DINSTALL_SCRIPTDIR="bin"
78 -DINSTALL_SECURE_FILE_PRIVDIR="/var/db/mysql_secure"
79 -DINSTALL_SHAREDIR="share"
80 -DINSTALL_SUPPORTFILESDIR="share/mysql"
81 -DMYSQL_KEYRINGDIR="etc/mysql/keyring"
82 -DWITH_BOOST="{{WRKSRC}}/boost"
83 -DWITH_EDITLINE=system
84 -DWITH_LIBEVENT=system
87 -DWITH_SSL={{OPENSSLBASE}}
88 -DWITH_EMBEDDED_SERVER="ON"
89 -DINSTALL_MYSQLTESTDIR=0
91 [PERFSCHEMA].DESCRIPTION= Provide "Performance Schema Storage" engine
92 [PERFSCHEMA].CMAKE_ARGS_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
94 [EXAMPLE].DESCRIPTION= Provide "Example Storage" engine
95 [EXAMPLE].CMAKE_ARGS_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1
97 [PARTITION].DESCRIPTION= Provide "Partitioning support Storage" engine
98 [PARTITION].CMAKE_ARGS_ON= -DWITH_PARTITION_STORAGE_ENGINE=1
100 [BLACKHOLE].DESCRIPTION= Provide "Blackhole Storage" engine
101 [BLACKHOLE].CMAKE_ARGS_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1
103 [PERFORMANCE].DESCRIPTION= Enable "Performance Schema" (High RAM usage)
104 [PERFORMANCE].SUB_LIST_OFF= PERFSCHEMRC="--skip-performance-schema"
105 [PERFORMANCE].SUB_LIST_ON= PERFSCHEMRC=""
107 [ARCHIVE].DESCRIPTION= Provide "Archive Storage" engine
108 [ARCHIVE].CMAKE_ARGS_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1
110 [FEDERATED].DESCRIPTION= Provide "Federated Storage" engine
111 [FEDERATED].CMAKE_ARGS_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1
112 [FEDERATED].SUB_LIST_OFF= FEDER=""
113 [FEDERATED].SUB_LIST_ON= FEDER="--federated"
115 [INNOBASE].DESCRIPTION= Provide "InnoDB Storage" engine
116 [INNOBASE].CMAKE_ARGS_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1
119 ${REINPLACE_CMD} -e 's|/usr/bin/perl|${PREFIX}/bin/perl|' \
120 -e 's|/usr/local/bin/perl|${PREFIX}/bin/perl|' \
121 ${WRKSRC}/scripts/CMakeLists.txt
124 ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mysql/keyring \
125 ${STAGEDIR}/var/db/mysql_secure \
126 ${STAGEDIR}/var/db/mysql_tmpdir
127 ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample \
128 ${STAGEDIR}${PREFIX}/etc/mysql/my.cnf.sample
129 ${RM} ${STAGEDIR}${MANPREFIX}/man/man1/zlib_decompress.1 \
130 ${STAGEDIR}${MANPREFIX}/man/man1/lz4_decompress.1
131 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/lib*.so
132 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/*.so
133 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/mysqld
134 # Linux doesn't like -R flags
135 ${SED} -i'' -e 's| -R| -Wl,-rpath,|g' \
136 ${STAGEDIR}${PREFIX}/bin/mysql_config
137 list=$$(cd ${STAGEDIR}${PREFIX}/bin && ${LS} * | ${AWK} \
138 '{ if ($$1 != "mysql_config" && $$1 != "mysqld_mult" && \
139 $$1 != "mysqld_safe" && $$1 != "mysqldumpslow" && \
140 $$1 != "mysqld_multi") print}'); \
141 (cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} $$list)
144 @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
147 ${RM} ${WRKSRC}/cmake/os/FreeBSD.cmake
149 [FILE:294:descriptions/desc.server]
150 MySQL is a very fast, multi-threaded, multi-user and robust SQL
151 (Structured Query Language) database server.
153 MySQL, the most popular Open Source SQL database management system, is
154 developed, distributed, and supported by Oracle Corporation.
156 This package contains the MySQL server components.
159 [FILE:150:descriptions/desc.client]
160 MySQL is a very fast, multi-threaded, multi-user and robust SQL
161 (Structured Query Language) database server.
163 This package contains the MySQL client.
167 ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 48931457 mysql-boost-5.7.21.tar.gz
170 [FILE:3619:manifests/plist.server]
171 @dir(mysql,mysql,0750) %%MY_SECDIR%%
172 @dir(mysql,mysql,0750) %%MY_TMPDIR%%
173 @dir(mysql,mysql,0750) etc/mysql/keyring
174 @sample(root,wheel,0644) etc/mysql/my.cnf.sample
185 mysql_secure_installation
198 lib/mysql/libmysqld.a
202 %%ONLY-LINUX%%lib/mysql/plugin/auth_socket.so
204 connection_control.so
213 libtest_services_threaded.so
214 libtest_session_detach.so
215 libtest_session_in_thd.so
216 libtest_session_info.so
217 libtest_sql_2_sessions.so
218 libtest_sql_all_col_types.so
219 libtest_sql_cmds_1.so
220 libtest_sql_commit.so
221 libtest_sql_complex.so
222 libtest_sql_errors.so
224 libtest_sql_processlist.so
225 libtest_sql_replication.so
226 libtest_sql_shutdown.so
227 libtest_sql_sqlmode.so
228 libtest_sql_stored_procedures_functions.so
229 libtest_sql_views_triggers.so
230 libtest_x_sessions_deinit.so
231 libtest_x_sessions_init.so
239 replication_observers_example_plugin.so
244 test_security_context.so
250 my_print_defaults.1.gz
257 mysql_install_db.1.gz
259 mysql_secure_installation.1.gz
260 mysql_ssl_rsa_setup.1.gz
261 mysql-stress-test.pl.1.gz
262 mysql-test-run.pl.1.gz
263 mysql_tzinfo_to_sql.1.gz
270 mysqltest_embedded.1.gz
273 resolve_stack_dump.1.gz
275 share/man/man8/mysqld.8.gz
276 share/mysql/bulgarian/errmsg.sys
277 share/mysql/charsets/
304 share/mysql/czech/errmsg.sys
305 share/mysql/danish/errmsg.sys
308 share/mysql/dutch/errmsg.sys
309 share/mysql/english/errmsg.sys
311 share/mysql/estonian/errmsg.sys
313 share/mysql/french/errmsg.sys
314 share/mysql/german/errmsg.sys
315 share/mysql/greek/errmsg.sys
316 share/mysql/hungarian/errmsg.sys
317 innodb_memcached_config.sql
319 share/mysql/italian/errmsg.sys
320 share/mysql/japanese/errmsg.sys
321 share/mysql/korean/errmsg.sys
325 mysql_security_commands.sql
327 mysql_system_tables.sql
328 mysql_system_tables_data.sql
329 mysql_test_data_timezone.sql
331 share/mysql/norwegian-ny/errmsg.sys
332 share/mysql/norwegian/errmsg.sys
333 share/mysql/polish/errmsg.sys
334 share/mysql/portuguese/errmsg.sys
335 share/mysql/romanian/errmsg.sys
336 share/mysql/russian/errmsg.sys
337 share/mysql/serbian/errmsg.sys
338 share/mysql/slovak/errmsg.sys
339 share/mysql/spanish/errmsg.sys
340 share/mysql/swedish/errmsg.sys
341 share/mysql/ukrainian/errmsg.sys
342 uninstall_rewriter.sql
345 [FILE:2559:manifests/plist.client]
364 byte_order_generic_x86.h
387 client_authentication.h
392 group_replication_priv.h
403 plugin_group_replication.h
407 plugin_validate_password.h
408 include/mysql/mysql/psi/
427 service_my_plugin_log.h
428 service_my_snprintf.h
429 service_mysql_alloc.h
430 service_mysql_keyring.h
431 service_mysql_password_policy.h
432 service_mysql_string.h
434 service_rpl_transaction_ctx.h
435 service_rpl_transaction_write_set.h
436 service_rules_table.h
437 service_security_context.h
438 service_srv_session.h
439 service_srv_session_info.h
440 service_ssl_wrapper.h
442 service_thd_engine_lock.h
444 service_thread_scheduler.h
460 plugin_group_replication.h
462 plugin_validate_password.h
476 lib/pkgconfig/mysqlclient.pc
477 share/aclocal/mysql.m4
481 mysql_client_test.1.gz
482 mysql_client_test_embedded.1.gz
484 mysql_config_editor.1.gz
495 [FILE:1384:patches/patch-CMakeLists.txt]
496 --- CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
498 @@ -582,6 +582,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
501 # Check for pthread_getthreadid_np()
502 +set(CMAKE_REQUIRED_LIBRARIES pthread)
503 CHECK_C_SOURCE_COMPILES("
504 #include <pthread_np.h>
505 int main(int ac, char **av)
506 @@ -590,6 +591,7 @@ int main(int ac, char **av)
507 return (tid != 0 ? 0 : 1);
509 HAVE_PTHREAD_GETTHREADID_NP)
510 +set(CMAKE_REQUIRED_LIBRARIES "")
512 # Check for pthread_self() returning an integer type
513 CHECK_C_SOURCE_COMPILES("
514 @@ -676,7 +678,6 @@ IF(NOT WITHOUT_SERVER)
515 OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
516 IF(WITH_EMBEDDED_SERVER)
517 ADD_SUBDIRECTORY(libmysqld)
518 - ADD_SUBDIRECTORY(libmysqld/examples)
519 ENDIF(WITH_EMBEDDED_SERVER)
522 @@ -737,7 +738,6 @@ ELSE()
523 SET(CPACK_GENERATOR "TGZ")
525 ADD_SUBDIRECTORY(packaging/WiX)
526 -ADD_SUBDIRECTORY(packaging/solaris)
529 INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
530 @@ -745,6 +745,7 @@ ENDIF()
532 # RPM installs documentation directly from the source tree
535 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
536 INSTALL(FILES COPYING LICENSE.mysql
537 DESTINATION ${INSTALL_DOCREADMEDIR}
538 @@ -767,6 +768,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
539 PATTERN "sp-imp-spec.txt" EXCLUDE
548 [FILE:566:patches/patch-cmake_plugin.cmake]
549 --- cmake/plugin.cmake.orig 2017-12-28 03:46:26 UTC
550 +++ cmake/plugin.cmake
551 @@ -264,9 +264,6 @@ MACRO(MYSQL_ADD_PLUGIN)
552 MYSQL_INSTALL_TARGETS(${target}
553 DESTINATION ${INSTALL_PLUGINDIR}
554 COMPONENT ${INSTALL_COMPONENT})
555 - INSTALL_DEBUG_TARGET(${target}
556 - DESTINATION ${INSTALL_PLUGINDIR}/debug
557 - COMPONENT ${INSTALL_COMPONENT})
558 # Add installed files to list for RPMs
559 FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
560 "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
563 [FILE:435:patches/patch-cmake_ssl.cmake]
564 --- cmake/ssl.cmake.orig 2017-12-28 03:46:26 UTC
566 @@ -180,6 +180,12 @@ MACRO (MYSQL_CHECK_SSL)
567 OPENSSL_MAJOR_VERSION STREQUAL "1"
569 SET(OPENSSL_FOUND TRUE)
570 + ELSEIF(OPENSSL_INCLUDE_DIR AND
571 + OPENSSL_LIBRARY AND
573 + OPENSSL_MAJOR_VERSION STREQUAL "2"
575 + SET(OPENSSL_FOUND TRUE)
577 SET(OPENSSL_FOUND FALSE)
581 [FILE:491:patches/patch-include_my__compare.h]
582 --- include/my_compare.h.orig 2017-12-28 03:46:26 UTC
583 +++ include/my_compare.h
584 @@ -40,7 +40,7 @@ extern "C" {
585 But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
588 -#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
589 +#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
590 #define HA_MAX_KEY_SEG 16 /* Max segments for key */
592 #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
595 [FILE:419:patches/patch-include_my__thread__os__id.h]
596 --- include/my_thread_os_id.h.orig 2017-12-28 03:46:26 UTC
597 +++ include/my_thread_os_id.h
598 @@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
599 return pthread_getthreadid_np();
601 #ifdef HAVE_INTEGER_PTHREAD_SELF
602 +# ifdef __DragonFly__
603 + return syscall(SYS_lwp_gettid);
605 /* Unknown platform, fallback. */
606 return pthread_self();
609 /* Feature not available. */
613 [FILE:549:patches/patch-include_myisam.h]
614 --- include/myisam.h.orig 2017-12-28 03:46:26 UTC
616 @@ -45,7 +45,7 @@ extern "C" {
617 The following defines can be increased if necessary.
618 But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
620 -#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
621 +#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
622 #define MI_MAX_KEY_SEG 16 /* Max segments for key */
624 #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
627 [FILE:434:patches/patch-libmysql_CMakeLists.txt]
628 --- libmysql/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
629 +++ libmysql/CMakeLists.txt
630 @@ -274,7 +274,7 @@ IF(NOT DISABLE_SHARED)
631 COMPONENT SharedLibraries)
633 # libtool compatability
634 - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
635 + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly|Linux" OR APPLE)
636 SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
638 SET(OS_SHARED_LIB_VERSION
641 [FILE:334:patches/patch-libservices_CMakeLists.txt]
642 --- libservices/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
643 +++ libservices/CMakeLists.txt
644 @@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
645 mysql_keyring_service.c)
647 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
649 INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
653 [FILE:1910:patches/patch-mysys__ssl_my__default.cc]
654 --- mysys_ssl/my_default.cc.orig 2017-12-28 03:46:26 UTC
655 +++ mysys_ssl/my_default.cc
656 @@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
658 /* Which directories are searched for options (and in which order) */
660 -#define MAX_DEFAULT_DIRS 6
661 +#define MAX_DEFAULT_DIRS 7
662 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
663 static const char **default_directories = NULL;
665 @@ -918,6 +918,14 @@ static int search_default_file_with_ext(
666 return 1; /* Ignore wrong files */
669 + if (strstr(name, "/etc") == name)
672 + "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
677 while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
680 @@ -1256,7 +1264,8 @@ void my_print_default_files(const char *
681 end[(strlen(end)-1)] = ' ';
683 strxmov(end, conf_file, *ext , " ", NullS);
684 - fputs(name, stdout);
685 + if (strstr(name, "/etc") != name)
686 + fputs(name, stdout);
690 @@ -1415,13 +1424,8 @@ static const char **init_default_directo
694 - errors += add_directory(alloc, "/etc/", dirs);
695 - errors += add_directory(alloc, "/etc/mysql/", dirs);
697 -#if defined(DEFAULT_SYSCONFDIR)
698 - if (DEFAULT_SYSCONFDIR[0])
699 - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
700 -#endif /* DEFAULT_SYSCONFDIR */
701 + errors += add_directory(alloc, "/usr/local/etc/", dirs);
702 + errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
706 @@ -1492,7 +1496,7 @@ int check_file_permissions(const char *f
709 if (!my_stat(file_name,&stat_info,MYF(0)))
713 Ignore .mylogin.cnf file if not exclusively readable/writable
717 [FILE:430:patches/patch-plugin_password__validation_validate__password.cc]
718 --- plugin/password_validation/validate_password.cc.orig 2017-12-28 03:46:26 UTC
719 +++ plugin/password_validation/validate_password.cc
721 #include <mysql/plugin_validate_password.h>
722 #include <mysql/service_my_plugin_log.h>
723 #include <mysql/service_mysql_string.h>
724 +/* solve clash between libc++ bitset::test() and test macro from my_global.h */
731 [FILE:545:patches/patch-rapid_plugin_x_CMakeLists.txt]
732 --- rapid/plugin/x/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
733 +++ rapid/plugin/x/CMakeLists.txt
734 @@ -92,14 +92,14 @@ ELSE()
735 ${CMAKE_SOURCE_DIR}/include #temporary
736 ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
737 ${CMAKE_CURRENT_BINARY_DIR}/generated
738 - ${SSL_INCLUDE_DIRS}
739 - ${ZLIB_INCLUDE_DIR}
740 + ${BOOST_INCLUDE_DIR}
743 INCLUDE_DIRECTORIES(SYSTEM
744 - ${BOOST_INCLUDE_DIR}
745 ${PROTOBUF_INCLUDE_DIRS}
746 ${LIBEVENT_INCLUDE_DIR}
747 + ${SSL_INCLUDE_DIRS}
748 + ${ZLIB_INCLUDE_DIR}
751 IF(XPLUGIN_NO_LITE_PROTOBUF)
754 [FILE:678:patches/patch-rapid_plugin_x_mysqlx__configure.cmake]
755 --- rapid/plugin/x/mysqlx_configure.cmake.orig 2017-12-28 03:46:26 UTC
756 +++ rapid/plugin/x/mysqlx_configure.cmake
757 @@ -35,6 +35,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
758 CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
759 ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
762 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
763 DESTINATION ${INSTALL_INCLUDEDIR}
764 COMPONENT Developement)
765 @@ -46,3 +47,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
766 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
767 DESTINATION ${INSTALL_INCLUDEDIR}
768 COMPONENT Developement)
772 [FILE:652:patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt]
773 --- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
774 +++ rapid/unittest/gunit/xplugin/CMakeLists.txt
775 @@ -64,7 +64,6 @@ ENDIF()
776 ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO -DXPLUGIN_UNIT_TESTS)
778 INCLUDE_DIRECTORIES(SYSTEM
779 - ${BOOST_INCLUDE_DIR}
780 ${PROTOBUF_INCLUDE_DIRS}
782 ${LIBEVENT_INCLUDE_DIR}
783 @@ -74,6 +73,7 @@ INCLUDE_DIRECTORIES(SYSTEM
787 + ${BOOST_INCLUDE_DIR}
788 ${CMAKE_SOURCE_DIR}/testing/include
789 ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
790 ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
793 [FILE:1179:patches/patch-scripts_CMakeLists.txt]
794 --- scripts/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
795 +++ scripts/CMakeLists.txt
796 @@ -292,7 +292,7 @@ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR
797 SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
798 SET(localstatedir ${MYSQL_DATADIR})
800 -IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
802 SET(RPATH_OPTION " -R$pkglibdir")
805 @@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
806 GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
807 STRING(REGEX REPLACE "^lib" "" lib "${lib}")
808 SET(${var} "${${var}}-l${lib} " )
809 + ELSEIF(lib STREQUAL "-pthread")
810 + SET(${var} "${${var}}-pthread " )
812 SET(${var} "${${var}}-l${lib} " )
814 @@ -458,7 +460,7 @@ ELSE()
815 FOREACH(file ${BIN_SCRIPTS})
816 IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
817 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
818 - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
819 + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
820 ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
821 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
822 ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
825 [FILE:268:patches/patch-sql_CMakeLists.txt]
826 --- sql/CMakeLists.txt.orig 2017-12-28 03:46:26 UTC
827 +++ sql/CMakeLists.txt
828 @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
831 ${CMAKE_BINARY_DIR}/sql
832 + ${CMAKE_BINARY_DIR}/include
833 + ${CMAKE_BINARY_DIR}
839 [FILE:1264:patches/patch-sql_conn__handler_socket__connection.cc]
840 --- sql/conn_handler/socket_connection.cc.orig 2017-12-28 03:46:26 UTC
841 +++ sql/conn_handler/socket_connection.cc
842 @@ -943,22 +943,25 @@ Channel_info* Mysqld_socket_listener::li
843 signal(SIGCHLD, SIG_DFL);
844 request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
845 mysql_socket_getfd(connect_sock), NULL);
847 + void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
850 - if (!hosts_access(&req))
851 + int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
852 + if (!my_hosts_access(&req))
855 This may be stupid but refuse() includes an exit(0)
856 which we surely don't want...
857 clean_exit() - same stupid thing ...
859 + char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
860 syslog(LOG_AUTH | m_deny_severity,
861 - "refused connect from %s", eval_client(&req));
862 + "refused connect from %s", my_eval_client(&req));
864 #ifdef HAVE_LIBWRAP_PROTOTYPES
865 // Some distros have patched tcpd.h to have proper prototypes
867 - (req.sink)(req.fd);
868 + ((void (*)(int)) (req.sink))(req.fd);
870 // Some distros have not patched tcpd.h
874 [FILE:2575:patches/patch-sql_sql__view.cc]
875 --- sql/sql_view.cc.orig 2017-12-28 03:46:26 UTC
877 @@ -773,46 +773,46 @@ static const int required_view_parameter
879 static File_option view_parameters[]=
880 {{{ C_STRING_WITH_LEN("query")},
881 - my_offsetof(TABLE_LIST, select_stmt),
882 + static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
883 FILE_OPTIONS_ESTRING},
884 {{ C_STRING_WITH_LEN("md5")},
885 - my_offsetof(TABLE_LIST, md5),
886 + static_cast<int>(my_offsetof(TABLE_LIST, md5)),
887 FILE_OPTIONS_STRING},
888 {{ C_STRING_WITH_LEN("updatable")},
889 - my_offsetof(TABLE_LIST, updatable_view),
890 + static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
891 FILE_OPTIONS_ULONGLONG},
892 {{ C_STRING_WITH_LEN("algorithm")},
893 - my_offsetof(TABLE_LIST, algorithm),
894 + static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
895 FILE_OPTIONS_ULONGLONG},
896 {{ C_STRING_WITH_LEN("definer_user")},
897 - my_offsetof(TABLE_LIST, definer.user),
898 + static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
899 FILE_OPTIONS_STRING},
900 {{ C_STRING_WITH_LEN("definer_host")},
901 - my_offsetof(TABLE_LIST, definer.host),
902 + static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
903 FILE_OPTIONS_STRING},
904 {{ C_STRING_WITH_LEN("suid")},
905 - my_offsetof(TABLE_LIST, view_suid),
906 + static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
907 FILE_OPTIONS_ULONGLONG},
908 {{ C_STRING_WITH_LEN("with_check_option")},
909 - my_offsetof(TABLE_LIST, with_check),
910 + static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
911 FILE_OPTIONS_ULONGLONG},
912 {{ C_STRING_WITH_LEN("timestamp")},
913 - my_offsetof(TABLE_LIST, timestamp),
914 + static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
915 FILE_OPTIONS_TIMESTAMP},
916 {{ C_STRING_WITH_LEN("create-version")},
917 - my_offsetof(TABLE_LIST, file_version),
918 + static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
919 FILE_OPTIONS_ULONGLONG},
920 {{ C_STRING_WITH_LEN("source")},
921 - my_offsetof(TABLE_LIST, source),
922 + static_cast<int>(my_offsetof(TABLE_LIST, source)),
923 FILE_OPTIONS_ESTRING},
924 {{(char*) STRING_WITH_LEN("client_cs_name")},
925 - my_offsetof(TABLE_LIST, view_client_cs_name),
926 + static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
927 FILE_OPTIONS_STRING},
928 {{(char*) STRING_WITH_LEN("connection_cl_name")},
929 - my_offsetof(TABLE_LIST, view_connection_cl_name),
930 + static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
931 FILE_OPTIONS_STRING},
932 {{(char*) STRING_WITH_LEN("view_body_utf8")},
933 - my_offsetof(TABLE_LIST, view_body_utf8),
934 + static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
935 FILE_OPTIONS_ESTRING},
940 [FILE:1921:patches/patch-sql_sys__vars.cc]
941 --- sql/sys_vars.cc.orig 2017-12-28 03:46:26 UTC
943 @@ -1736,7 +1736,7 @@ static Sys_var_ulong Sys_interactive_tim
944 "connection before closing it",
945 SESSION_VAR(net_interactive_timeout),
946 CMD_LINE(REQUIRED_ARG),
947 - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
948 + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
950 static Sys_var_ulong Sys_join_buffer_size(
952 @@ -2572,7 +2572,7 @@ static Sys_var_ulong Sys_net_read_timeou
953 "Number of seconds to wait for more data from a connection before "
955 SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
956 - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
957 + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
958 NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
959 ON_UPDATE(fix_net_read_timeout));
961 @@ -2596,7 +2596,7 @@ static Sys_var_ulong Sys_net_write_timeo
962 "Number of seconds to wait for a block to be written to a connection "
963 "before aborting the write",
964 SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
965 - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
966 + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
967 NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
968 ON_UPDATE(fix_net_write_timeout));
970 @@ -4249,7 +4249,7 @@ static Sys_var_ulong Sys_net_wait_timeou
971 "The number of seconds the server waits for activity on a "
972 "connection before closing it",
973 SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
974 - VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
975 + VALID_RANGE(1, INT_MAX32/1000),
976 DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
978 static Sys_var_plugin Sys_default_storage_engine(
981 [FILE:440:patches/patch-storage_innobase_include_srv0mon.h]
982 --- storage/innobase/include/srv0mon.h.orig 2017-12-28 03:46:26 UTC
983 +++ storage/innobase/include/srv0mon.h
984 @@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang
985 /* Required for FreeBSD so that INT64_MAX is defined. */
986 #define __STDC_LIMIT_MACROS
987 #endif /* __STDC_LIMIT_MACROS */
988 +#ifdef __DragonFly__
989 +/* The hack above doen't work for dragonfly, stdint.h already imported */
990 +#include <machine/int_limits.h>
997 [FILE:985:patches/patch-storage_myisam_mi__dynrec.c]
998 --- storage/myisam/mi_dynrec.c.orig 2017-12-28 03:46:26 UTC
999 +++ storage/myisam/mi_dynrec.c
1000 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
1004 - I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
1006 - Do not reserve swap space for this mapping. When swap space is
1007 - reserved, one has the guarantee that it is possible to modify the
1008 - mapping. When swap space is not reserved one might get SIGSEGV
1009 - upon a write if no physical memory is available.
1010 + MAP_NORESERVE is unimplemented in FreeBSD
1012 info->s->file_map= (uchar*)
1013 my_mmap(0, (size_t) size,
1014 info->s->mode==O_RDONLY ? PROT_READ :
1015 PROT_READ | PROT_WRITE,
1016 - MAP_SHARED | MAP_NORESERVE,
1019 if (info->s->file_map == (uchar*) MAP_FAILED)
1023 [FILE:2284:files/my.cnf.sample.in]
1024 # $FreeBSD: head/databases/mysql57-server/files/my.cnf.sample.in 414707 2016-05-06 14:39:59Z riggs $
1028 socket = /tmp/mysql.sock
1031 prompt = \u@\h [\d]>\_
1037 socket = /tmp/mysql.sock
1038 bind-address = 127.0.0.1
1039 basedir = %%PREFIX%%
1040 datadir = %%MY_DBDIR%%
1041 tmpdir = %%MY_TMPDIR%%
1042 slave-load-tmpdir = %%MY_TMPDIR%%
1043 secure-file-priv = %%MY_SECDIR%%
1046 master-info-repository = TABLE
1047 relay-log-info-repository = TABLE
1048 relay-log-recovery = 1
1053 binlog_cache_size = 16M
1054 expire_logs_days = 30
1055 default_password_lifetime = 0
1056 enforce-gtid-consistency = 1
1058 safe-user-create = 1
1059 lower_case_table_names = 1
1060 explicit-defaults-for-timestamp = 1
1061 myisam-recover-options = BACKUP,FORCE
1062 open_files_limit = 32768
1063 table_open_cache = 16384
1064 table_definition_cache = 8192
1065 net_retry_count = 16384
1066 key_buffer_size = 256M
1067 max_allowed_packet = 64M
1068 query_cache_type = 0
1069 query_cache_size = 0
1070 long_query_time = 0.5
1071 innodb_buffer_pool_size = 1G
1072 innodb_data_home_dir = %%MY_DBDIR%%
1073 innodb_log_group_home_dir = %%MY_DBDIR%%
1074 innodb_data_file_path = ibdata1:128M:autoextend
1075 innodb_temp_data_file_path = ibtmp1:128M:autoextend
1076 innodb_flush_method = O_DIRECT
1077 innodb_log_file_size = 256M
1078 innodb_log_buffer_size = 16M
1079 innodb_write_io_threads = 8
1080 innodb_read_io_threads = 8
1081 innodb_autoinc_lock_mode = 2
1085 max_allowed_packet = 256M
1090 [FILE:2582:files/mysql-server.in]
1093 # $FreeBSD: head/databases/mysql57-server/files/mysql-server.in 434623 2017-02-22 17:25:22Z mmokhi $
1101 # Add the following line to /etc/rc.conf to enable mysql:
1102 # mysql_enable (bool): Set to "NO" by default.
1103 # Set it to "YES" to enable MySQL.
1104 # mysql_limits (bool): Set to "NO" by default.
1105 # Set it to yes to run `limits -e -U mysql`
1106 # just before mysql starts.
1107 # mysql_dbdir (str): Default to "%%MY_DBDIR%%"
1108 # Base database directory.
1109 # mysql_confdir (str): Default to "%%ETCDIR%%"
1110 # Base configuration directory.
1111 # mysql_optfile (str): Server-specific option file.
1112 # Set it in the rc.conf or default behaviour of
1113 # `mysqld_safe` itself, will be picking
1114 # ${mysql_confdir}/my.cnf if it exists.
1115 # mysql_pidfile (str): Custum PID file path and name.
1116 # Default to "${mysql_dbdir}/${hostname}.pid".
1117 # mysql_args (str): Custom additional arguments to be passed
1118 # to mysqld_safe (default empty).
1126 load_rc_config $name
1128 : ${mysql_enable="NO"}
1129 : ${mysql_limits="NO"}
1130 : ${mysql_dbdir="%%MY_DBDIR%%"}
1131 : ${mysql_confdir="%%ETCDIR%%"}
1132 if [ -f "${mysql_confdir}/my.cnf" ]; then
1133 : ${mysql_optfile="${mysql_confdir}/my.cnf"}
1134 elif [ -f "${mysql_dbdir}/my.cnf" ]; then
1135 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
1137 if [ ! -z "${mysql_optfile}" ]; then
1138 mysql_extra="--defaults-extra-file=${mysql_optfile}"
1142 mysql_limits_args="-e -U ${mysql_user}"
1143 : ${hostname:=`/bin/hostname`}
1144 pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
1145 command="/usr/sbin/daemon"
1146 command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
1147 procname="%%PREFIX%%/libexec/mysqld"
1148 start_precmd="${name}_prestart"
1149 start_postcmd="${name}_poststart"
1150 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
1151 mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
1153 mysql_create_auth_tables()
1155 eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
1160 if [ ! -d "${mysql_dbdir}/mysql/." ]; then
1161 mysql_create_auth_tables || return 1
1163 if checkyesno mysql_limits; then
1164 eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
1173 while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
1174 timeout=$(( timeout - 1 ))
1183 [FILE:576:files/pkg-message-server.in]
1184 *****************************************************************************
1186 Remember to run mysql_upgrade the first time you start the MySQL server
1187 after an upgrade from an earlier version.
1189 Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
1190 ie. when you want to use "mysql -u root -p" first you should see password
1191 in /root/.mysql_secret
1193 MySQL57 has a default %%ETCDIR%%/my.cnf,
1194 remember to replace it wit your own
1195 or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
1197 *****************************************************************************