1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
7 SDESC[standard]= Fast SQL database server, derived from MySQL
8 HOMEPAGE= https://mariadb.org/
12 SITES[main]= https://downloads.mariadb.com/MariaDB/mariadb-10.6.3/source/
13 DISTFILE[1]= mariadb-10.6.3.tar.gz:main
15 SPKGS[standard]= complete
20 OPTIONS_AVAILABLE= none
21 OPTIONS_STANDARD= none
23 BUILD_DEPENDS= bison:primary:standard
24 BUILDRUN_DEPENDS= boost-libraries:rest:python_used
25 snappy:single:standard
26 msgpack:single:standard
33 USERGROUP_SPKG= server
35 USES= cmake zlib ssl readline ncurses shebangfix cpe
36 python:build perl:build pkgconfig iconv:translit
37 zstd lz4 lzo bz2 execinfo
38 GNOME_COMPONENTS= libxml2
40 DISTNAME= mariadb-10.6.3
43 LICENSE_TERMS= server:{{WRKDIR}}/TERMS
44 LICENSE_FILE= GPLv2:{{WRKSRC}}/COPYING
45 LICENSE_AWK= TERMS:"^\#include"
46 LICENSE_SOURCE= TERMS:{{WRKSRC}}/libmysqld/libmysqld.c
51 FPC_EQUIVALENT= databases/mariadb104-server
52 SHEBANG_FILES= scripts/*.sh
54 INSTALL_REQ_TOOLCHAIN= yes
55 PLIST_SUB= PORTNAME=mariadb106
57 CMAKE_ARGS= -DCOMPILATION_COMMENT="Ravenports"
58 -DINSTALL_INCLUDEDIR=include/mysql
59 -DINSTALL_PLUGINDIR=lib/mysql/plugin
60 -DINSTALL_SHAREDIR=share
61 -DINSTALL_SUPPORTFILESDIR=share/mysql
62 -DINSTALL_MYSQLSHAREDIR=share/mysql
63 -DINSTALL_DOCREADMEDIR=share/doc/mariadb106
64 -DINSTALL_DOCDIR=share/doc/mariadb106
65 -DINSTALL_LIBDIR=lib/mysql
66 -DINSTALL_MANDIR=share/man
67 -DINSTALL_SCRIPTDIR=bin
68 -DINSTALL_MYSQLTESTDIR=
69 -DINSTALL_SQLBENCHDIR=
70 -DDEFAULT_CHARSET=utf8mb4
71 -DDEFAULT_COLLATION=utf8mb4_unicode_ci
72 -DDEFAULT_SYSCONFDIR="{{PREFIX}}/etc"
73 -DENABLED_LOCAL_INFILE=ON
77 -DWITH_EMBEDDED_SERVER=ON
78 -DWITH_EXTRA_CHARSETS=complex
83 -DWITH_READLINE=system
84 -DWITH_SSL="{{OPENSSLBASE}}"
88 VAR_OPSYS[freebsd]= CXXFLAGS=-DHAVE_POSIX_MEMALIGN=1
91 ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' \
92 ${WRKSRC}/CMakeLists.txt
93 ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
94 ${WRKSRC}/mysys/my_default.c
95 ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
96 ${WRKSRC}/scripts/mysql_config.sh \
97 ${WRKSRC}/scripts/CMakeLists.txt
98 ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
99 ${WRKSRC}/cmake/os/DragonFly.cmake
102 ${RM} ${STAGEDIR}${STD_DOCDIR}/COPYING
103 ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
104 ${STAGEDIR}${PREFIX}/lib/pkgconfig/
105 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
106 # strip plugins and libraries
107 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadb.so
108 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadbd.so
109 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/*.so
111 @flist=$$(${FIND} ${STAGEDIR}${PREFIX}/bin -type f -perm /111 -print) ;\
112 for f in $$flist; do \
113 (${FILE} $$f | ${GREP} -Fq ", not stripped")\
114 && ${ECHO_CMD} "Auto-stripping $$f"\
115 && ${STRIP_CMD} $$f || ${TRUE} ;\
119 ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
120 -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
121 ${BUILD_WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
122 ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
123 -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
124 -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
125 -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
126 ${BUILD_WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
128 [FILE:807:descriptions/desc.server]
129 MariaDB Server is one of the most popular database servers in the world.
130 It's made by the original developers of MySQL and guaranteed to stay open
131 source. Notable users include Wikipedia, WordPress.com and Google.
133 MariaDB turns data into structured information in a wide array of
134 applications, ranging from banking to websites. It is an enhanced, drop-in
135 replacement for MySQL. MariaDB is used because it is fast, scalable and
136 robust, with a rich ecosystem of storage engines, plugins and many other
137 tools make it very versatile for a wide variety of use cases.
139 MariaDB is developed as open source software and as a relational database
140 it provides an SQL interface for accessing data. The latest versions of
141 MariaDB also include GIS and JSON features.
143 This package contains the server and related files.
146 [FILE:267:descriptions/desc.client]
147 MariaDB Server is one of the most popular database servers in the world.
148 It's made by the original developers of MySQL and guaranteed to stay open
149 source. Notable users include Wikipedia, WordPress.com and Google.
151 This package contains the client and related files.
155 5bc125606af5ec1fda80f594c1ddfacef8b305c158ecf8b1ca7a3f01cd0b18db 82053322 mariadb-10.6.3.tar.gz
158 [FILE:11593:manifests/plist.server]
170 mariadb-client-test-embedded
175 mariadb-fix-extensions
178 mariadb-secure-installation
180 mariadb-test-embedded
181 mariadb-tzinfo-to-sql
196 mysql_client_test_embedded
202 mysql_secure_installation
219 wsrep_sst_mariabackup
223 include/mysql/server/
226 byte_order_generic_x86.h
227 byte_order_generic_x86_64.h
269 include/mysql/server/mysql/
280 plugin_password_validation.h
284 service_encryption_scheme.h
286 service_kill_statement.h
290 service_my_print_error.h
291 service_my_snprintf.h
292 service_progress_report.h
296 service_thd_autoinc.h
297 service_thd_error_context.h
300 service_thd_specifics.h
301 service_thd_timezone.h
305 include/mysql/server/mysql/psi/
324 include/mysql/server/private/
348 event_db_repository.h
365 handle_connections_win.h
439 mysqld_default_groups.h
452 pfs_memory_provider.h
453 pfs_metadata_provider.h
454 pfs_socket_provider.h
456 pfs_statement_provider.h
458 pfs_thread_provider.h
459 pfs_transaction_provider.h
462 probes_mysql_nodtrace.h
489 semisync_master_ack_receiver.h
533 sql_expression_cache.h
534 sql_get_diagnostics.h
551 sql_partition_admin.h
602 threadpool_winsockets.h
611 welcome_copyright_notice.h
618 wsrep_client_service.h
620 wsrep_condition_variable.h
621 wsrep_high_priority_service.h
627 wsrep_server_service.h
630 wsrep_storage_service.h
632 wsrep_trans_observer.h
638 include/mysql/server/private/atomic/
653 auth_gssapi_client.so
655 caching_sha2_password.so
656 debug_key_management.so
658 example_key_management.so
659 file_key_management.so
672 ha_test_sql_discovery.so
676 metadata_lock_info.so
682 query_response_time.so
684 simple_password_check.so
691 share/aclocal/mysql.m4
695 share/groonga-normalizer-mysql/
705 galera_new_cluster.1.gz
710 mariadb-client-test-embedded.1.gz
711 mariadb-client-test.1.gz
713 mariadb-dumpslow.1.gz
714 mariadb-embedded.1.gz
715 mariadb-fix-extensions.1.gz
716 mariadb-install-db.1.gz
718 mariadb-secure-installation.1.gz
719 mariadb-service-convert.1.gz
720 mariadb-test-embedded.1.gz
722 mariadb-tzinfo-to-sql.1.gz
727 mariadbd-safe-helper.1.gz
730 my_print_defaults.1.gz
735 myrocks_hotbackup.1.gz
737 mysql_client_test.1.gz
738 mysql_client_test_embedded.1.gz
740 mysql_fix_extensions.1.gz
741 mysql_install_db.1.gz
743 mysql_secure_installation.1.gz
744 mysql_tzinfo_to_sql.1.gz
748 mysqld_safe_helper.1.gz
751 mysqltest_embedded.1.gz
754 resolve_stack_dump.1.gz
756 wsrep_sst_common.1.gz
757 wsrep_sst_mariabackup.1.gz
758 wsrep_sst_mysqldump.1.gz
760 wsrep_sst_rsync_wan.1.gz
770 maria_add_gis_sp_bootstrap.sql
773 mysql_performance_tables.sql
775 mysql_system_tables.sql
776 mysql_system_tables_data.sql
777 mysql_test_data_timezone.sql
782 share/mysql/charsets/
809 share/mysql/czech/errmsg.sys
810 share/mysql/danish/errmsg.sys
811 share/mysql/dutch/errmsg.sys
812 share/mysql/english/errmsg.sys
813 share/mysql/estonian/errmsg.sys
814 share/mysql/french/errmsg.sys
815 share/mysql/german/errmsg.sys
816 share/mysql/greek/errmsg.sys
817 share/mysql/hindi/errmsg.sys
818 share/mysql/hungarian/errmsg.sys
819 share/mysql/italian/errmsg.sys
820 share/mysql/japanese/errmsg.sys
821 share/mysql/korean/errmsg.sys
827 share/mysql/norwegian/errmsg.sys
828 share/mysql/norwegian-ny/errmsg.sys
829 share/mysql/policy/apparmor/
832 usr.sbin.mysqld.local
833 share/mysql/policy/selinux/
838 share/mysql/polish/errmsg.sys
839 share/mysql/portuguese/errmsg.sys
840 share/mysql/romanian/errmsg.sys
841 share/mysql/russian/errmsg.sys
842 share/mysql/serbian/errmsg.sys
843 share/mysql/slovak/errmsg.sys
844 share/mysql/spanish/errmsg.sys
845 share/mysql/swedish/errmsg.sys
846 share/mysql/ukrainian/errmsg.sys
849 [FILE:5012:manifests/plist.client]
856 mariadb-convert-table-format
862 mariadb-setpermission
869 mysql_convert_table_format
901 include/mysql/mariadb/ma_io.h
919 mysql_clear_password.so
929 mariadb-convert-table-format.1.gz
931 mariadb-find-rows.1.gz
935 mariadb-setpermission.1.gz
941 mysql-stress-test.pl.1.gz
942 mysql-test-run.pl.1.gz
945 mysql_convert_table_format.1.gz
948 mysql_setpermission.1.gz
962 mariadb_connection.3.gz
963 mariadb_dyncol_check.3.gz
964 mariadb_dyncol_column_cmp_named.3.gz
965 mariadb_dyncol_column_count.3.gz
966 mariadb_dyncol_create_many_named.3.gz
967 mariadb_dyncol_create_many_num.3.gz
968 mariadb_dyncol_exists_named.3.gz
969 mariadb_dyncol_exists_num.3.gz
970 mariadb_dyncol_free.3.gz
971 mariadb_dyncol_list_named.3.gz
972 mariadb_dyncol_list_num.3.gz
973 mariadb_dyncol_unpack.3.gz
974 mariadb_dyncol_update_many_named.3.gz
975 mariadb_dyncol_update_many_num.3.gz
976 mariadb_get_infov.3.gz
977 mariadb_reconnect.3.gz
978 mariadb_rpl_close.3.gz
979 mariadb_rpl_fetch.3.gz
980 mariadb_rpl_get_optionsv.3.gz
981 mariadb_rpl_open.3.gz
982 mariadb_rpl_optionsv.3.gz
983 mariadb_stmt_execute_direct.3.gz
984 mariadb_stmt_fetch_fields.3.gz
985 mysql_affected_rows.3.gz
986 mysql_autocommit.3.gz
987 mysql_change_user.3.gz
993 mysql_fetch_field.3.gz
994 mysql_fetch_field_direct.3.gz
995 mysql_fetch_fields.3.gz
996 mysql_fetch_lengths.3.gz
998 mysql_field_count.3.gz
999 mysql_field_seek.3.gz
1000 mysql_field_tell.3.gz
1001 mysql_free_result.3.gz
1002 mysql_get_character_set_info.3.gz
1003 mysql_get_client_info.3.gz
1004 mysql_get_client_version.3.gz
1005 mysql_get_host_info.3.gz
1006 mysql_get_proto_info.3.gz
1007 mysql_get_server_info.3.gz
1008 mysql_get_server_version.3.gz
1009 mysql_get_socket.3.gz
1010 mysql_get_ssl_cipher.3.gz
1011 mysql_hex_string.3.gz
1015 mysql_more_results.3.gz
1016 mysql_next_result.3.gz
1017 mysql_num_fields.3.gz
1024 mysql_read_query_result.3.gz
1025 mysql_real_connect.3.gz
1026 mysql_real_escape_string.3.gz
1027 mysql_real_query.3.gz
1029 mysql_reset_connection.3.gz
1033 mysql_select_db.3.gz
1034 mysql_send_query.3.gz
1035 mysql_server_end.3.gz
1036 mysql_server_init.3.gz
1037 mysql_session_track_get_first.3.gz
1038 mysql_session_track_get_next.3.gz
1039 mysql_set_character_set.3.gz
1040 mysql_set_server_option.3.gz
1045 mysql_stmt_affected_rows.3.gz
1046 mysql_stmt_attr_get.3.gz
1047 mysql_stmt_attr_set.3.gz
1048 mysql_stmt_bind_param.3.gz
1049 mysql_stmt_bind_result.3.gz
1050 mysql_stmt_close.3.gz
1051 mysql_stmt_data_seek.3.gz
1052 mysql_stmt_errno.3.gz
1053 mysql_stmt_error.3.gz
1054 mysql_stmt_execute.3.gz
1055 mysql_stmt_fetch.3.gz
1056 mysql_stmt_fetch_column.3.gz
1057 mysql_stmt_field_count.3.gz
1058 mysql_stmt_free_result.3.gz
1059 mysql_stmt_init.3.gz
1060 mysql_stmt_insert_id.3.gz
1061 mysql_stmt_more_results.3.gz
1062 mysql_stmt_next_result.3.gz
1063 mysql_stmt_num_rows.3.gz
1064 mysql_stmt_param_count.3.gz
1065 mysql_stmt_param_metadata.3.gz
1066 mysql_stmt_prepare.3.gz
1067 mysql_stmt_reset.3.gz
1068 mysql_stmt_result_metadata.3.gz
1069 mysql_stmt_row_seek.3.gz
1070 mysql_stmt_row_tell.3.gz
1071 mysql_stmt_send_long_data.3.gz
1072 mysql_stmt_sqlstate.3.gz
1073 mysql_stmt_store_result.3.gz
1074 mysql_stmt_warning_count.3.gz
1075 mysql_store_result.3.gz
1076 mysql_thread_end.3.gz
1077 mysql_thread_id.3.gz
1078 mysql_thread_init.3.gz
1079 mysql_use_result.3.gz
1080 mysql_warning_count.3.gz
1083 [FILE:86:manifests/plist.docs]
1084 share/doc/%%PORTNAME%%/
1092 [FILE:572:patches/patch-client_mysql.cc]
1093 --- client/mysql.cc.orig 2021-07-05 10:15:47 UTC
1095 @@ -62,8 +62,8 @@ static char *server_version= NULL;
1098 #if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
1099 -#include <curses.h>
1101 +#include <ncurses/curses.h>
1102 +#include <ncurses/term.h>
1104 #if defined(HAVE_TERMIOS_H)
1105 #include <termios.h>
1106 @@ -82,7 +82,7 @@ extern "C" {
1108 #undef SYSV // hack to avoid syntax error
1111 +#include <ncurses/term.h>
1114 #endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */
1117 [FILE:1958:patches/patch-cmake_readline.cmake]
1118 --- cmake/readline.cmake.orig 2021-07-05 10:15:47 UTC
1119 +++ cmake/readline.cmake
1120 @@ -52,40 +52,17 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
1124 + SET(CURSES_NEED_NCURSES True)
1125 FIND_PACKAGE(Curses)
1126 MARK_AS_ADVANCED(CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H)
1127 IF(NOT CURSES_FOUND)
1128 SET(ERRORMSG "Curses library not found. Please install appropriate package,
1129 remove CMakeCache.txt and rerun cmake.")
1130 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1131 - SET(ERRORMSG ${ERRORMSG}
1132 - "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates "
1133 - "it is ncurses-devel.")
1135 MESSAGE(FATAL_ERROR ${ERRORMSG})
1138 - IF(CURSES_HAVE_CURSES_H)
1139 - SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1141 - IF(CMAKE_SYSTEM_NAME MATCHES "HP")
1142 - # CMake uses full path to library /lib/libcurses.sl
1143 - # On Itanium, it results into architecture mismatch+
1144 - # the library is for PA-RISC
1145 - SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
1147 + SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1149 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1150 - # -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora
1151 - # Lower-level libcurses calls are exposed by libtinfo
1152 - CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} tputs "" HAVE_TPUTS_IN_CURSES)
1153 - IF(NOT HAVE_TPUTS_IN_CURSES)
1154 - CHECK_LIBRARY_EXISTS(tinfo tputs "" HAVE_TPUTS_IN_TINFO)
1155 - IF(HAVE_TPUTS_IN_TINFO)
1156 - SET(CURSES_LIBRARY tinfo)
1160 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} setupterm "" HAVE_SETUPTERM)
1161 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} vidattr "" HAVE_VIDATTR)
1163 @@ -220,6 +197,8 @@ MACRO (MYSQL_CHECK_READLINE)
1164 SET(CMAKE_REQUIRED_LIBRARIES)
1165 SET(CMAKE_REQUIRED_INCLUDES)
1167 + SET(CMAKE_REQUIRED_INCLUDES ${CURSES_INCLUDE_DIR}/ncurses)
1168 CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
1169 + SET(CMAKE_REQUIRED_INCLUDES)
1174 [FILE:349:patches/patch-extra_readline_CMakeLists.txt]
1175 --- extra/readline/CMakeLists.txt.orig 2021-07-05 10:15:47 UTC
1176 +++ extra/readline/CMakeLists.txt
1177 @@ -56,4 +56,4 @@ ADD_LIBRARY(readline STATIC
1179 # Declare dependency
1180 # so every executable that links with readline links with curses as well
1181 -TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY})
1182 +TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY} tinfo)
1185 [FILE:1605:patches/patch-mysys_my__default.c]
1186 --- mysys/my_default.c.orig 2021-07-05 10:15:49 UTC
1187 +++ mysys/my_default.c
1188 @@ -624,7 +624,7 @@ static int search_default_file_with_ext(
1191 if (!my_stat(name,&stat_info,MYF(0)))
1195 Ignore world-writable regular files.
1196 This is mainly done to protect us to not read a file created by
1197 @@ -647,6 +647,14 @@ static int search_default_file_with_ext(
1198 add_option(ctx, name))
1201 + if (strstr(name, "/etc") == name)
1204 + "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
1209 while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
1212 @@ -914,7 +922,8 @@ void my_print_default_files(const char *
1213 if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
1215 strxmov(end, conf_file, *ext, " ", NullS);
1216 - fputs(name, stdout);
1217 + if (strstr(name, "/etc") != name)
1218 + fputs(name, stdout);
1222 @@ -1041,13 +1050,10 @@ static const char **init_default_directo
1226 -#if defined(DEFAULT_SYSCONFDIR)
1227 - if (DEFAULT_SYSCONFDIR[0])
1228 - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
1230 errors += add_directory(alloc, "/etc/", dirs);
1231 errors += add_directory(alloc, "/etc/mysql/", dirs);
1232 -#endif /* DEFAULT_SYSCONFDIR */
1233 + errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
1234 + errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
1240 [FILE:1167:patches/patch-oqgraph-MDEV-15291]
1241 --- storage/oqgraph/oqgraph_judy.cc.orig 2021-07-05 10:15:50 UTC
1242 +++ storage/oqgraph/oqgraph_judy.cc
1245 Currently the only active code that can return error is:
1246 judy_bitset::reset()/J1U()
1247 - judy_bitset::setbit()/J1S()
1248 + judy_bitset::jsetbit()/J1S()
1250 In most cases errors are either about wrong parameters passed to Judy
1251 functions or internal structures corruption. These definitely deserve
1252 @@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
1256 -open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
1257 +open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
1261 --- storage/oqgraph/oqgraph_judy.h.orig 2021-07-05 10:15:50 UTC
1262 +++ storage/oqgraph/oqgraph_judy.h
1263 @@ -63,7 +63,7 @@ namespace open_query
1268 + return jsetbit(n);
1271 judy_bitset& set(const judy_bitset& src);
1272 @@ -115,7 +115,7 @@ namespace open_query
1274 mutable void* array;
1276 - judy_bitset& setbit(size_type n);
1277 + judy_bitset& jsetbit(size_type n);
1283 [FILE:413:patches/patch-scripts_CMakeLists.txt]
1284 --- scripts/CMakeLists.txt.orig 2021-07-05 10:15:49 UTC
1285 +++ scripts/CMakeLists.txt
1286 @@ -136,11 +136,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles|Ni
1290 -IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
1291 - SET (PERL_PATH "/usr/local/bin/perl")
1293 - SET (PERL_PATH "/usr/bin/perl")
1295 +SET (PERL_PATH "%%LOCALBASE%%/bin/perl")
1298 # FIND_PROC and CHECK_PID are used by mysqld_safe
1301 [FILE:403:patches/patch-scripts_mysql__config.sh]
1302 --- scripts/mysql_config.sh.orig 2021-07-05 10:15:49 UTC
1303 +++ scripts/mysql_config.sh
1304 @@ -87,7 +87,9 @@ fi
1307 libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
1308 +libs="$libs -L%%LOCALBASE%%/lib "
1309 embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
1310 +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
1312 include="-I$pkgincludedir"
1313 if [ "$basedir" != "/usr" ]; then
1316 [FILE:445:patches/patch-scripts_mysqld__safe.sh]
1317 --- scripts/mysqld_safe.sh.orig 2021-07-05 10:15:49 UTC
1318 +++ scripts/mysqld_safe.sh
1319 @@ -556,11 +556,11 @@ fi
1321 if test -z "$MYSQL_HOME"
1323 - if test -r "$DATADIR/my.cnf"
1324 + if test -r "$DATADIR/etc/my.cnf"
1326 log_error "WARNING: Found $DATADIR/my.cnf
1327 The data directory is not a valid location for my.cnf, please move it to
1328 -$MY_BASEDIR_VERSION/my.cnf"
1329 +$MY_BASEDIR_VERSION/etc/my.cnf"
1331 MYSQL_HOME=$MY_BASEDIR_VERSION
1335 [FILE:484:patches/patch-scripts_wsrep__sst__mariabackup.sh]
1336 --- scripts/wsrep_sst_mariabackup.sh.orig 2021-07-05 10:15:49 UTC
1337 +++ scripts/wsrep_sst_mariabackup.sh
1338 @@ -696,7 +696,7 @@ recv_joiner()
1340 if [ $tmt -gt 0 ]; then
1341 if [ -n "$(command -v timeout)" ]; then
1342 - if timeout --help | grep -qw -- '-k'; then
1343 + if timeout --help 2>&1 | grep -qw -- '-k'; then
1344 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
1346 ltcmd="timeout -s9 $tmt $tcmd"
1349 [FILE:250:patches/patch-sql_mysqld.cc]
1350 --- sql/mysqld.cc.orig 2021-07-05 10:15:49 UTC
1352 @@ -4562,8 +4562,9 @@ static void init_ssl()
1353 sql_print_warning("SSL error: %s",buf);
1358 ERR_remove_state(0);
1365 [FILE:1422:patches/patch-storage_innobase_lz4.cmake]
1366 --- storage/innobase/lz4.cmake.orig 2021-07-05 10:15:49 UTC
1367 +++ storage/innobase/lz4.cmake
1368 @@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
1370 MACRO (MYSQL_CHECK_LZ4)
1371 IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
1372 - CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
1373 - CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
1374 - CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
1375 + find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
1376 + find_library(LZ4_LIBRARY NAMES lz4)
1378 + get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
1379 +#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
1380 + IF (LZ4_INCLUDE_DIR)
1381 + SET(HAVE_LZ4_H YES)
1383 + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
1384 + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
1386 IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
1387 ADD_DEFINITIONS(-DHAVE_LZ4=1)
1388 IF (HAVE_LZ4_COMPRESS_DEFAULT)
1389 ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
1391 - LINK_LIBRARIES(lz4)
1392 + LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
1394 IF (WITH_INNODB_LZ4 STREQUAL "ON")
1395 MESSAGE(FATAL_ERROR "Required lz4 library is not found")
1404 [FILE:1513:patches/patch-storage_innobase_lzo.cmake]
1405 --- storage/innobase/lzo.cmake.orig 2021-07-05 10:15:49 UTC
1406 +++ storage/innobase/lzo.cmake
1407 @@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
1409 MACRO (MYSQL_CHECK_LZO_STATIC)
1410 IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
1411 - CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
1412 - CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
1414 + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB)
1415 IF(HAVE_LZO_LIB AND HAVE_LZO_H)
1416 ADD_DEFINITIONS(-DHAVE_LZO=1)
1417 - LINK_LIBRARIES(liblzo2.a)
1418 + LINK_LIBRARIES(lzo2)
1420 IF (WITH_INNODB_LZO STREQUAL "ON")
1421 MESSAGE(FATAL_ERROR "Required lzo library is not found")
1422 @@ -33,12 +31,16 @@ ENDMACRO()
1424 MACRO (MYSQL_CHECK_LZO)
1425 IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
1426 - CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
1427 - CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
1429 + find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
1430 + find_library(LZO_LIBRARY NAMES lzo2)
1431 + get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
1435 + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
1436 IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
1437 ADD_DEFINITIONS(-DHAVE_LZO=1)
1438 - LINK_LIBRARIES(lzo2)
1439 + LINK_LIBRARIES(${LZO_LIBRARY})
1441 IF (WITH_INNODB_LZO STREQUAL "ON")
1442 MESSAGE(FATAL_ERROR "Required lzo library is not found")
1445 [FILE:1855:patches/patch-storage_rocksdb_ha__rocksdb.cc]
1446 --- storage/rocksdb/ha_rocksdb.cc.orig 2021-07-05 10:15:50 UTC
1447 +++ storage/rocksdb/ha_rocksdb.cc
1448 @@ -266,7 +266,7 @@ Rdb_cf_manager cf_manager;
1449 Rdb_ddl_manager ddl_manager;
1450 Rdb_binlog_manager binlog_manager;
1452 -#if !defined(_WIN32) && !defined(__APPLE__)
1453 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1454 Rdb_io_watchdog *io_watchdog = nullptr;
1457 @@ -848,7 +848,7 @@ static void rocksdb_set_io_write_timeout
1458 void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
1459 DBUG_ASSERT(save != nullptr);
1460 DBUG_ASSERT(rdb != nullptr);
1461 -#if !defined(_WIN32) && !defined(__APPLE__)
1462 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1463 DBUG_ASSERT(io_watchdog != nullptr);
1466 @@ -857,7 +857,7 @@ static void rocksdb_set_io_write_timeout
1467 const uint32_t new_val = *static_cast<const uint32_t *>(save);
1469 rocksdb_io_write_timeout_secs = new_val;
1470 -#if !defined(_WIN32) && !defined(__APPLE__)
1471 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1472 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1474 RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
1475 @@ -5771,7 +5771,7 @@ static int rocksdb_init_func(void *const
1476 directories.push_back(myrocks::rocksdb_wal_dir);
1479 -#if !defined(_WIN32) && !defined(__APPLE__)
1480 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1481 io_watchdog = new Rdb_io_watchdog(std::move(directories));
1482 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1484 @@ -5878,7 +5878,7 @@ static int rocksdb_done_func(void *const
1485 delete commit_latency_stats;
1486 commit_latency_stats = nullptr;
1488 -#if !defined(_WIN32) && !defined(__APPLE__)
1489 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1491 io_watchdog = nullptr;
1495 [FILE:249:patches/patch-storage_rocksdb_rdb__buff.h]
1496 --- storage/rocksdb/rdb_buff.h.orig 2021-07-05 10:15:50 UTC
1497 +++ storage/rocksdb/rdb_buff.h
1499 #define be16toh(x) OSSwapBigToHostInt16(x)
1502 +#include "port/port_posix.h"
1504 /* MySQL header files */
1505 #include "./my_global.h"
1509 [FILE:328:patches/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h]
1510 --- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2021-07-05 10:15:51 UTC
1511 +++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
1513 #include <jemalloc/jemalloc.h>
1517 +#define JEMALLOC_USABLE_SIZE_CONST const
1520 #ifndef JEMALLOC_CXX_THROW
1521 #define JEMALLOC_CXX_THROW
1525 [FILE:492:patches/patch-storage_rocksdb_ut0counter.h]
1526 --- storage/rocksdb/ut0counter.h.orig 2021-07-05 10:15:50 UTC
1527 +++ storage/rocksdb/ut0counter.h
1528 @@ -30,6 +30,12 @@ Created 2012/04/12 by Sunny Bains
1531 #define get_curr_thread_id() GetCurrentThreadId()
1532 +#elif defined __FreeBSD__
1533 +#include <pthread_np.h>
1534 +#define get_curr_thread_id() pthread_getthreadid_np()
1535 +#elif defined __DragonFly__
1536 +#include <sys/syscall.h>
1537 +#define get_curr_thread_id() syscall(SYS_lwp_gettid)
1539 #define get_curr_thread_id() pthread_self()