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.5.8/source/
13 DISTFILE[1]= mariadb-10.5.8.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.5.8
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
56 CMAKE_ARGS= -DCOMPILATION_COMMENT="Ravenports"
57 -DINSTALL_INCLUDEDIR=include/mysql
58 -DINSTALL_PLUGINDIR=lib/mysql/plugin
59 -DINSTALL_SHAREDIR=share
60 -DINSTALL_SUPPORTFILESDIR=share/mysql
61 -DINSTALL_MYSQLSHAREDIR=share/mysql
62 -DINSTALL_DOCREADMEDIR=share/doc/mariadb105
63 -DINSTALL_DOCDIR=share/doc/mariadb105
64 -DINSTALL_LIBDIR=lib/mysql
65 -DINSTALL_MANDIR=share/man
66 -DINSTALL_SCRIPTDIR=bin
67 -DINSTALL_MYSQLTESTDIR=
68 -DINSTALL_SQLBENCHDIR=
69 -DDEFAULT_CHARSET=utf8mb4
70 -DDEFAULT_COLLATION=utf8mb4_unicode_ci
71 -DDEFAULT_SYSCONFDIR="{{PREFIX}}/etc"
72 -DENABLED_LOCAL_INFILE=ON
76 -DWITH_EMBEDDED_SERVER=ON
77 -DWITH_EXTRA_CHARSETS=complex
82 -DWITH_READLINE=system
83 -DWITH_SSL="{{OPENSSLBASE}}"
87 VAR_OPSYS[freebsd]= CXXFLAGS=-DHAVE_POSIX_MEMALIGN=1
90 ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' \
91 ${WRKSRC}/CMakeLists.txt
92 ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
93 ${WRKSRC}/mysys/my_default.c
94 ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
95 ${WRKSRC}/scripts/mysql_config.sh \
96 ${WRKSRC}/scripts/CMakeLists.txt
97 ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
98 ${WRKSRC}/cmake/os/DragonFly.cmake
101 ${RM} ${STAGEDIR}${STD_DOCDIR}/COPYING
102 ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
103 ${STAGEDIR}${PREFIX}/lib/pkgconfig/
104 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
105 # strip plugins and libraries
106 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadb.so
107 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadbd.so
108 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/*.so
110 @flist=$$(${FIND} ${STAGEDIR}${PREFIX}/bin -type f -perm /111 -print) ;\
111 for f in $$flist; do \
112 (${FILE} $$f | ${GREP} -Fq ", not stripped")\
113 && ${ECHO_CMD} "Auto-stripping $$f"\
114 && ${STRIP_CMD} $$f || ${TRUE} ;\
118 ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
119 -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
120 ${BUILD_WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
121 ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
122 -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
123 -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
124 -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
125 ${BUILD_WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
127 [FILE:807:descriptions/desc.server]
128 MariaDB Server is one of the most popular database servers in the world.
129 It's made by the original developers of MySQL and guaranteed to stay open
130 source. Notable users include Wikipedia, WordPress.com and Google.
132 MariaDB turns data into structured information in a wide array of
133 applications, ranging from banking to websites. It is an enhanced, drop-in
134 replacement for MySQL. MariaDB is used because it is fast, scalable and
135 robust, with a rich ecosystem of storage engines, plugins and many other
136 tools make it very versatile for a wide variety of use cases.
138 MariaDB is developed as open source software and as a relational database
139 it provides an SQL interface for accessing data. The latest versions of
140 MariaDB also include GIS and JSON features.
142 This package contains the server and related files.
145 [FILE:267:descriptions/desc.client]
146 MariaDB Server is one of the most popular database servers in the world.
147 It's made by the original developers of MySQL and guaranteed to stay open
148 source. Notable users include Wikipedia, WordPress.com and Google.
150 This package contains the client and related files.
154 eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8 88206163 mariadb-10.5.8.tar.gz
157 [FILE:11575:manifests/plist.server]
169 mariadb-client-test-embedded
174 mariadb-fix-extensions
177 mariadb-secure-installation
179 mariadb-test-embedded
180 mariadb-tzinfo-to-sql
195 mysql_client_test_embedded
201 mysql_secure_installation
218 wsrep_sst_mariabackup
222 include/mysql/server/
225 byte_order_generic_x86.h
226 byte_order_generic_x86_64.h
268 include/mysql/server/mysql/
279 plugin_password_validation.h
283 service_encryption_scheme.h
285 service_kill_statement.h
289 service_my_print_error.h
290 service_my_snprintf.h
291 service_progress_report.h
295 service_thd_autoinc.h
296 service_thd_error_context.h
299 service_thd_specifics.h
300 service_thd_timezone.h
304 include/mysql/server/mysql/psi/
323 include/mysql/server/private/
344 event_db_repository.h
361 handle_connections_win.h
436 mysqld_default_groups.h
450 pfs_memory_provider.h
451 pfs_metadata_provider.h
452 pfs_socket_provider.h
454 pfs_statement_provider.h
456 pfs_thread_provider.h
457 pfs_transaction_provider.h
460 probes_mysql_nodtrace.h
487 semisync_master_ack_receiver.h
531 sql_expression_cache.h
532 sql_get_diagnostics.h
549 sql_partition_admin.h
609 welcome_copyright_notice.h
616 wsrep_client_service.h
618 wsrep_condition_variable.h
619 wsrep_high_priority_service.h
625 wsrep_server_service.h
628 wsrep_storage_service.h
630 wsrep_trans_observer.h
636 include/mysql/server/private/atomic/
651 auth_gssapi_client.so
653 caching_sha2_password.so
654 debug_key_management.so
656 example_key_management.so
657 file_key_management.so
670 ha_test_sql_discovery.so
674 metadata_lock_info.so
680 query_response_time.so
682 simple_password_check.so
689 share/aclocal/mysql.m4
693 share/groonga-normalizer-mysql/
703 galera_new_cluster.1.gz
708 mariadb-client-test-embedded.1.gz
709 mariadb-client-test.1.gz
711 mariadb-dumpslow.1.gz
712 mariadb-embedded.1.gz
713 mariadb-fix-extensions.1.gz
714 mariadb-install-db.1.gz
716 mariadb-secure-installation.1.gz
717 mariadb-service-convert.1.gz
718 mariadb-test-embedded.1.gz
720 mariadb-tzinfo-to-sql.1.gz
725 mariadbd-safe-helper.1.gz
728 my_print_defaults.1.gz
733 myrocks_hotbackup.1.gz
735 mysql_client_test.1.gz
736 mysql_client_test_embedded.1.gz
738 mysql_fix_extensions.1.gz
739 mysql_install_db.1.gz
741 mysql_secure_installation.1.gz
742 mysql_tzinfo_to_sql.1.gz
746 mysqld_safe_helper.1.gz
749 mysqltest_embedded.1.gz
752 resolve_stack_dump.1.gz
754 wsrep_sst_common.1.gz
755 wsrep_sst_mariabackup.1.gz
756 wsrep_sst_mysqldump.1.gz
758 wsrep_sst_rsync_wan.1.gz
768 maria_add_gis_sp_bootstrap.sql
771 mysql_performance_tables.sql
772 mysql_system_tables.sql
773 mysql_system_tables_data.sql
774 mysql_test_data_timezone.sql
780 share/mysql/charsets/
807 share/mysql/czech/errmsg.sys
808 share/mysql/danish/errmsg.sys
809 share/mysql/dutch/errmsg.sys
810 share/mysql/english/errmsg.sys
811 share/mysql/estonian/errmsg.sys
812 share/mysql/french/errmsg.sys
813 share/mysql/german/errmsg.sys
814 share/mysql/greek/errmsg.sys
815 share/mysql/hindi/errmsg.sys
816 share/mysql/hungarian/errmsg.sys
817 share/mysql/italian/errmsg.sys
818 share/mysql/japanese/errmsg.sys
819 share/mysql/korean/errmsg.sys
825 share/mysql/norwegian/errmsg.sys
826 share/mysql/norwegian-ny/errmsg.sys
827 share/mysql/policy/apparmor/
830 usr.sbin.mysqld.local
831 share/mysql/policy/selinux/
836 share/mysql/polish/errmsg.sys
837 share/mysql/portuguese/errmsg.sys
838 share/mysql/romanian/errmsg.sys
839 share/mysql/russian/errmsg.sys
840 share/mysql/serbian/errmsg.sys
841 share/mysql/slovak/errmsg.sys
842 share/mysql/spanish/errmsg.sys
843 share/mysql/swedish/errmsg.sys
844 share/mysql/ukrainian/errmsg.sys
847 [FILE:1879:manifests/plist.client]
854 mariadb-convert-table-format
860 mariadb-setpermission
867 mysql_convert_table_format
899 include/mysql/mariadb/ma_io.h
917 mysql_clear_password.so
927 mariadb-convert-table-format.1.gz
929 mariadb-find-rows.1.gz
933 mariadb-setpermission.1.gz
939 mysql-stress-test.pl.1.gz
940 mysql-test-run.pl.1.gz
943 mysql_convert_table_format.1.gz
946 mysql_setpermission.1.gz
960 [FILE:103:manifests/plist.docs]
961 share/doc/mariadb105/
970 [FILE:572:patches/patch-client_mysql.cc]
971 --- client/mysql.cc.orig 2020-11-10 13:14:53 UTC
973 @@ -62,8 +62,8 @@ static char *server_version= NULL;
976 #if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
979 +#include <ncurses/curses.h>
980 +#include <ncurses/term.h>
982 #if defined(HAVE_TERMIOS_H)
984 @@ -82,7 +82,7 @@ extern "C" {
986 #undef SYSV // hack to avoid syntax error
989 +#include <ncurses/term.h>
992 #endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */
995 [FILE:1958:patches/patch-cmake_readline.cmake]
996 --- cmake/readline.cmake.orig 2020-11-10 13:14:53 UTC
997 +++ cmake/readline.cmake
998 @@ -52,40 +52,17 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
1002 + SET(CURSES_NEED_NCURSES True)
1003 FIND_PACKAGE(Curses)
1004 MARK_AS_ADVANCED(CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H)
1005 IF(NOT CURSES_FOUND)
1006 SET(ERRORMSG "Curses library not found. Please install appropriate package,
1007 remove CMakeCache.txt and rerun cmake.")
1008 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1009 - SET(ERRORMSG ${ERRORMSG}
1010 - "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates "
1011 - "it is ncurses-devel.")
1013 MESSAGE(FATAL_ERROR ${ERRORMSG})
1016 - IF(CURSES_HAVE_CURSES_H)
1017 - SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1019 - IF(CMAKE_SYSTEM_NAME MATCHES "HP")
1020 - # CMake uses full path to library /lib/libcurses.sl
1021 - # On Itanium, it results into architecture mismatch+
1022 - # the library is for PA-RISC
1023 - SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
1025 + SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1027 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1028 - # -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora
1029 - # Lower-level libcurses calls are exposed by libtinfo
1030 - CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} tputs "" HAVE_TPUTS_IN_CURSES)
1031 - IF(NOT HAVE_TPUTS_IN_CURSES)
1032 - CHECK_LIBRARY_EXISTS(tinfo tputs "" HAVE_TPUTS_IN_TINFO)
1033 - IF(HAVE_TPUTS_IN_TINFO)
1034 - SET(CURSES_LIBRARY tinfo)
1038 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} setupterm "" HAVE_SETUPTERM)
1039 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} vidattr "" HAVE_VIDATTR)
1041 @@ -220,6 +197,8 @@ MACRO (MYSQL_CHECK_READLINE)
1042 SET(CMAKE_REQUIRED_LIBRARIES)
1043 SET(CMAKE_REQUIRED_INCLUDES)
1045 + SET(CMAKE_REQUIRED_INCLUDES ${CURSES_INCLUDE_DIR}/ncurses)
1046 CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
1047 + SET(CMAKE_REQUIRED_INCLUDES)
1052 [FILE:349:patches/patch-extra_readline_CMakeLists.txt]
1053 --- extra/readline/CMakeLists.txt.orig 2020-11-10 13:14:53 UTC
1054 +++ extra/readline/CMakeLists.txt
1055 @@ -56,4 +56,4 @@ ADD_LIBRARY(readline STATIC
1057 # Declare dependency
1058 # so every executable that links with readline links with curses as well
1059 -TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY})
1060 +TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY} tinfo)
1063 [FILE:1605:patches/patch-mysys_my__default.c]
1064 --- mysys/my_default.c.orig 2020-11-10 13:14:59 UTC
1065 +++ mysys/my_default.c
1066 @@ -624,7 +624,7 @@ static int search_default_file_with_ext(
1069 if (!my_stat(name,&stat_info,MYF(0)))
1073 Ignore world-writable regular files.
1074 This is mainly done to protect us to not read a file created by
1075 @@ -647,6 +647,14 @@ static int search_default_file_with_ext(
1076 add_option(ctx, name))
1079 + if (strstr(name, "/etc") == name)
1082 + "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
1087 while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
1090 @@ -914,7 +922,8 @@ void my_print_default_files(const char *
1091 if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
1093 strxmov(end, conf_file, *ext, " ", NullS);
1094 - fputs(name, stdout);
1095 + if (strstr(name, "/etc") != name)
1096 + fputs(name, stdout);
1100 @@ -1041,13 +1050,10 @@ static const char **init_default_directo
1104 -#if defined(DEFAULT_SYSCONFDIR)
1105 - if (DEFAULT_SYSCONFDIR[0])
1106 - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
1108 errors += add_directory(alloc, "/etc/", dirs);
1109 errors += add_directory(alloc, "/etc/mysql/", dirs);
1110 -#endif /* DEFAULT_SYSCONFDIR */
1111 + errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
1112 + errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
1118 [FILE:1167:patches/patch-oqgraph-MDEV-15291]
1119 --- storage/oqgraph/oqgraph_judy.cc.orig 2020-11-10 13:15:02 UTC
1120 +++ storage/oqgraph/oqgraph_judy.cc
1123 Currently the only active code that can return error is:
1124 judy_bitset::reset()/J1U()
1125 - judy_bitset::setbit()/J1S()
1126 + judy_bitset::jsetbit()/J1S()
1128 In most cases errors are either about wrong parameters passed to Judy
1129 functions or internal structures corruption. These definitely deserve
1130 @@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
1134 -open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
1135 +open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
1139 --- storage/oqgraph/oqgraph_judy.h.orig 2020-11-10 13:15:02 UTC
1140 +++ storage/oqgraph/oqgraph_judy.h
1141 @@ -63,7 +63,7 @@ namespace open_query
1146 + return jsetbit(n);
1149 judy_bitset& set(const judy_bitset& src);
1150 @@ -115,7 +115,7 @@ namespace open_query
1152 mutable void* array;
1154 - judy_bitset& setbit(size_type n);
1155 + judy_bitset& jsetbit(size_type n);
1161 [FILE:413:patches/patch-scripts_CMakeLists.txt]
1162 --- scripts/CMakeLists.txt.orig 2020-11-10 13:14:59 UTC
1163 +++ scripts/CMakeLists.txt
1164 @@ -132,11 +132,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles|Ni
1168 -IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
1169 - SET (PERL_PATH "/usr/local/bin/perl")
1171 - SET (PERL_PATH "/usr/bin/perl")
1173 +SET (PERL_PATH "%%LOCALBASE%%/bin/perl")
1176 # FIND_PROC and CHECK_PID are used by mysqld_safe
1179 [FILE:403:patches/patch-scripts_mysql__config.sh]
1180 --- scripts/mysql_config.sh.orig 2020-11-10 13:14:59 UTC
1181 +++ scripts/mysql_config.sh
1182 @@ -87,7 +87,9 @@ fi
1185 libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
1186 +libs="$libs -L%%LOCALBASE%%/lib "
1187 embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
1188 +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
1190 include="-I$pkgincludedir"
1191 if [ "$basedir" != "/usr" ]; then
1194 [FILE:445:patches/patch-scripts_mysqld__safe.sh]
1195 --- scripts/mysqld_safe.sh.orig 2020-11-10 13:14:59 UTC
1196 +++ scripts/mysqld_safe.sh
1197 @@ -555,11 +555,11 @@ fi
1199 if test -z "$MYSQL_HOME"
1201 - if test -r "$DATADIR/my.cnf"
1202 + if test -r "$DATADIR/etc/my.cnf"
1204 log_error "WARNING: Found $DATADIR/my.cnf
1205 The data directory is not a valid location for my.cnf, please move it to
1206 -$MY_BASEDIR_VERSION/my.cnf"
1207 +$MY_BASEDIR_VERSION/etc/my.cnf"
1209 MYSQL_HOME=$MY_BASEDIR_VERSION
1213 [FILE:437:patches/patch-scripts_wsrep__sst__mariabackup.sh]
1214 --- scripts/wsrep_sst_mariabackup.sh.orig 2020-11-10 13:14:59 UTC
1215 +++ scripts/wsrep_sst_mariabackup.sh
1216 @@ -613,7 +613,7 @@ recv_joiner()
1219 if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
1220 - if timeout --help | grep -q -- '-k';then
1221 + if timeout --help 2>&1 | grep -q -- '-k';then
1222 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
1224 ltcmd="timeout -s9 $tmt $tcmd"
1227 [FILE:540:patches/patch-sql_mysqld.cc]
1228 --- sql/mysqld.cc.orig 2020-11-10 13:14:59 UTC
1230 @@ -3025,7 +3025,11 @@ pthread_handler_t signal_hand(void *arg
1235 if (!abort_loop && origin != SI_KERNEL)
1241 mysql_print_status(); // Print some debug info
1242 @@ -4434,8 +4438,9 @@ static void init_ssl()
1243 sql_print_warning("SSL error: %s",buf);
1248 ERR_remove_state(0);
1255 [FILE:1422:patches/patch-storage_innobase_lz4.cmake]
1256 --- storage/innobase/lz4.cmake.orig 2020-11-10 13:15:01 UTC
1257 +++ storage/innobase/lz4.cmake
1258 @@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
1260 MACRO (MYSQL_CHECK_LZ4)
1261 IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
1262 - CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
1263 - CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
1264 - CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
1265 + find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
1266 + find_library(LZ4_LIBRARY NAMES lz4)
1268 + get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
1269 +#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
1270 + IF (LZ4_INCLUDE_DIR)
1271 + SET(HAVE_LZ4_H YES)
1273 + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
1274 + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
1276 IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
1277 ADD_DEFINITIONS(-DHAVE_LZ4=1)
1278 IF (HAVE_LZ4_COMPRESS_DEFAULT)
1279 ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
1281 - LINK_LIBRARIES(lz4)
1282 + LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
1284 IF (WITH_INNODB_LZ4 STREQUAL "ON")
1285 MESSAGE(FATAL_ERROR "Required lz4 library is not found")
1294 [FILE:1513:patches/patch-storage_innobase_lzo.cmake]
1295 --- storage/innobase/lzo.cmake.orig 2020-11-10 13:15:01 UTC
1296 +++ storage/innobase/lzo.cmake
1297 @@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
1299 MACRO (MYSQL_CHECK_LZO_STATIC)
1300 IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
1301 - CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
1302 - CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
1304 + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB)
1305 IF(HAVE_LZO_LIB AND HAVE_LZO_H)
1306 ADD_DEFINITIONS(-DHAVE_LZO=1)
1307 - LINK_LIBRARIES(liblzo2.a)
1308 + LINK_LIBRARIES(lzo2)
1310 IF (WITH_INNODB_LZO STREQUAL "ON")
1311 MESSAGE(FATAL_ERROR "Required lzo library is not found")
1312 @@ -33,12 +31,16 @@ ENDMACRO()
1314 MACRO (MYSQL_CHECK_LZO)
1315 IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
1316 - CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
1317 - CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
1319 + find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
1320 + find_library(LZO_LIBRARY NAMES lzo2)
1321 + get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
1325 + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
1326 IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
1327 ADD_DEFINITIONS(-DHAVE_LZO=1)
1328 - LINK_LIBRARIES(lzo2)
1329 + LINK_LIBRARIES(${LZO_LIBRARY})
1331 IF (WITH_INNODB_LZO STREQUAL "ON")
1332 MESSAGE(FATAL_ERROR "Required lzo library is not found")
1335 [FILE:1855:patches/patch-storage_rocksdb_ha__rocksdb.cc]
1336 --- storage/rocksdb/ha_rocksdb.cc.orig 2020-11-10 13:15:02 UTC
1337 +++ storage/rocksdb/ha_rocksdb.cc
1338 @@ -260,7 +260,7 @@ Rdb_cf_manager cf_manager;
1339 Rdb_ddl_manager ddl_manager;
1340 Rdb_binlog_manager binlog_manager;
1342 -#if !defined(_WIN32) && !defined(__APPLE__)
1343 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1344 Rdb_io_watchdog *io_watchdog = nullptr;
1347 @@ -842,7 +842,7 @@ static void rocksdb_set_io_write_timeout
1348 void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
1349 DBUG_ASSERT(save != nullptr);
1350 DBUG_ASSERT(rdb != nullptr);
1351 -#if !defined(_WIN32) && !defined(__APPLE__)
1352 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1353 DBUG_ASSERT(io_watchdog != nullptr);
1356 @@ -851,7 +851,7 @@ static void rocksdb_set_io_write_timeout
1357 const uint32_t new_val = *static_cast<const uint32_t *>(save);
1359 rocksdb_io_write_timeout_secs = new_val;
1360 -#if !defined(_WIN32) && !defined(__APPLE__)
1361 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1362 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1364 RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
1365 @@ -5752,7 +5752,7 @@ static int rocksdb_init_func(void *const
1366 directories.push_back(myrocks::rocksdb_wal_dir);
1369 -#if !defined(_WIN32) && !defined(__APPLE__)
1370 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1371 io_watchdog = new Rdb_io_watchdog(std::move(directories));
1372 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1374 @@ -5859,7 +5859,7 @@ static int rocksdb_done_func(void *const
1375 delete commit_latency_stats;
1376 commit_latency_stats = nullptr;
1378 -#if !defined(_WIN32) && !defined(__APPLE__)
1379 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1381 io_watchdog = nullptr;
1385 [FILE:249:patches/patch-storage_rocksdb_rdb__buff.h]
1386 --- storage/rocksdb/rdb_buff.h.orig 2020-11-10 13:15:02 UTC
1387 +++ storage/rocksdb/rdb_buff.h
1389 #define be16toh(x) OSSwapBigToHostInt16(x)
1392 +#include "port/port_posix.h"
1394 /* MySQL header files */
1395 #include "./my_global.h"
1399 [FILE:493:patches/patch-storage_rocksdb_ut0counter.h]
1400 --- storage/rocksdb/ut0counter.h.orig 2020-11-10 13:15:02 UTC
1401 +++ storage/rocksdb/ut0counter.h
1402 @@ -30,6 +30,12 @@ Created 2012/04/12 by Sunny Bains
1405 #define get_curr_thread_id() GetCurrentThreadId()
1406 +#elif defined __FreeBSD__
1407 +#include <pthread_np.h>
1408 +#define get_curr_thread_id() pthread_getthreadid_np()
1409 +#elif defined __DragonFly__
1410 +#include <sys/syscall.h>
1411 +#define get_curr_thread_id() syscall(SYS_lwp_gettid)
1413 #define get_curr_thread_id() pthread_self()
1417 [FILE:328:freebsd/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h]
1418 --- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2020-06-23 15:10:17 UTC
1419 +++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
1421 #include <jemalloc/jemalloc.h>
1425 +#define JEMALLOC_USABLE_SIZE_CONST const
1428 #ifndef JEMALLOC_CXX_THROW
1429 #define JEMALLOC_CXX_THROW