diff options
Diffstat (limited to 'databases/mariadb100-server/files')
29 files changed, 0 insertions, 879 deletions
diff --git a/databases/mariadb100-server/files/extra-patch-include_my__compare.h b/databases/mariadb100-server/files/extra-patch-include_my__compare.h deleted file mode 100644 index 5fc447b98cd7..000000000000 --- a/databases/mariadb100-server/files/extra-patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 -+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 -@@ -40,7 +40,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb100-server/files/mysql-server.in b/databases/mariadb100-server/files/mysql-server.in deleted file mode 100644 index d3417eebce5f..000000000000 --- a/databases/mariadb100-server/files/mysql-server.in +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ -# -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_(instance_)?enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` -%%LEGACY_LIMITS%%# just before mysql starts. -# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_(instance_)?args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_(instance_)?pidfile (str): Custum PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_(instance_)?user (str): User to run mysqld as -# Default to "mysql" created by the port -# mysql_(instance_)?optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} -: ${mysql_user="mysql"} -%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" -%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" -%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" - eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" - eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" - ;; - *) - err 1 "$2 not found in mysql_instances" ;; - esac -else - if [ -n "${mysql_instances}" -a -n "$1" ]; then - for instance in ${mysql_instances}; do - eval _enable="\${mysql_${instance}_enable}" - case "${_enable:-${mysql_enable}}" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - continue - ;; - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - ;; - *) - if [ -z "$_enable" ]; then - _var=mysql_enable - else - _var=mysql_${instance}_enable - fi - warn "Bad value" \ - "'${_enable:-${mysql_enable}}'" \ - "for ${_var}. " \ - "Instance ${instance} skipped." - continue - ;; - esac - echo "===> mysql instance: ${instance}" - if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then - success="${instance} ${success}" - else - failed="${instance} (${retcode}) ${failed}" - fi - done - exit 0 - else - mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} - fi -fi - -pidfile=$mysql_pidfile -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args - [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} -} - -mysql_prestart() -{ - local dir - for dir in /etc /etc/mysql; do - if [ -f "${dir}/my.cnf" ]; then - echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" - return 1 - fi - done - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi -%%LEGACY_LIMITS%% if checkyesno mysql_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt deleted file mode 100644 index 124415c4f146..000000000000 --- a/databases/mariadb100-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ ---- CMakeLists.txt.orig 2018-01-27 18:40:35 UTC -+++ CMakeLists.txt -@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) -@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) - - # MDEV-6526 these files are not installed anymore -@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb100-server/files/patch-client_CMakeLists.txt b/databases/mariadb100-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index ad9967fb338b..000000000000 --- a/databases/mariadb100-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,70 +0,0 @@ ---- client/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ client/CMakeLists.txt -@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( - COPY_OPENSSL_DLLS(copy_openssl_client) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc - ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -37,6 +38,7 @@ IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli - - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - -@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl - MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) - SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) -+ENDIF() - - # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". - IF(WIN32) - MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) - ENDIF(WIN32) - -+IF(FALSE) - # async_example is just a code example, do not install it. - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example mysqlclient) -+ENDIF() - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-server/files/patch-cmake_ssl.cmake b/databases/mariadb100-server/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0414d663f59c..000000000000 --- a/databases/mariadb100-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/ssl.cmake.orig 2016-08-24 15:07:34 UTC -+++ cmake/ssl.cmake -@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL) - MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") - ENDIF() - -- # On mac this list is <.dylib;.so;.a> -- # We prefer static libraries, so we revert it here. -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") - FIND_LIBRARY(OPENSSL_LIBRARIES - NAMES ssl ssleay32 ssleay32MD -@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL) - FIND_LIBRARY(CRYPTO_LIBRARY - NAMES crypto libeay32 - HINTS ${OPENSSL_ROOT_DIR}/lib) -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARIES AND diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index aa0a7143e460..000000000000 --- a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ extra/CMakeLists.txt -@@ -78,8 +78,10 @@ IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) diff --git a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index 1301365656fc..000000000000 --- a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2015-06-17 14:54:11 UTC -+++ extra/yassl/taocrypt/src/integer.cpp -@@ -74,7 +74,7 @@ template <class T> - CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( - size_type n, const void *) - { -- if (n > this->max_size()) -+ if (n > AlignedAllocator<T>::max_size()) - return 0; - if (n == 0) - return 0; diff --git a/databases/mariadb100-server/files/patch-include_CMakeLists.txt b/databases/mariadb100-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index 388e12c58666..000000000000 --- a/databases/mariadb100-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- include/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ include/CMakeLists.txt -@@ -62,17 +62,21 @@ SET(HEADERS - handler_ername.h - ) - -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - ENDFOREACH(f) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") -+ENDIF() - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index a692fdfec2f0..000000000000 --- a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ libmysql/CMakeLists.txt -@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy - - # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) - - # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -418,6 +418,7 @@ IF(MSVC) - INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) - ENDIF() - -+IF(FALSE) - IF(UNIX) - MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) - SET(DOT_VERSION ".${VERSION}") -@@ -432,11 +433,13 @@ IF(UNIX) - ENDMACRO() - INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) - ENDIF() -+ENDIF() - - IF(NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) - ENDFOREACH() - ENDIF() - ENDIF() -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 1cb3f24acbeb..000000000000 --- a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ libservices/CMakeLists.txt -@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES - logger_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-man_CMakeLists.txt b/databases/mariadb100-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 852c5b63cd5c..000000000000 --- a/databases/mariadb100-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC -+++ man/CMakeLists.txt -@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys - - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+IF(FALSE) - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -- -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-mysys_my__default.c b/databases/mariadb100-server/files/patch-mysys_my__default.c deleted file mode 100644 index 70ab3073cf64..000000000000 --- a/databases/mariadb100-server/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC -+++ mysys/my_default.c -@@ -786,7 +786,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -804,6 +804,14 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1229,13 +1238,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb100-server/files/patch-mysys_stacktrace.c b/databases/mariadb100-server/files/patch-mysys_stacktrace.c deleted file mode 100644 index 93d636d4cdce..000000000000 --- a/databases/mariadb100-server/files/patch-mysys_stacktrace.c +++ /dev/null @@ -1,48 +0,0 @@ -https://jira.mariadb.org/browse/MDEV-15961 - ---- mysys/stacktrace.c.orig 2018-01-27 18:40:37 UTC -+++ mysys/stacktrace.c -@@ -34,19 +34,19 @@ - #include <execinfo.h> - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#ifdef HAVE_BSS_START - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - void my_init_stacktrace() - { --#ifdef HAVE_BSS_START -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - } - - #ifdef __linux__ -@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad - - int my_safe_print_str(const char* val, int max_len) - { -+#ifdef __linux__ - char *heap_end; - --#ifdef __linux__ - // Try and make use of /proc filesystem to safely print memory contents. - if (!safe_print_str(val, max_len)) - return 0; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { diff --git a/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 deleted file mode 100644 index 05083cd206ac..000000000000 --- a/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 +++ /dev/null @@ -1,40 +0,0 @@ ---- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.cc -@@ -27,7 +27,7 @@ - /* - Currently the only active code that can return error is: - judy_bitset::reset()/J1U() -- judy_bitset::setbit()/J1S() -+ judy_bitset::jsetbit()/J1S() - - In most cases errors are either about wrong parameters passed to Judy - functions or internal structures corruption. These definitely deserve -@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ - return rc == 1; - } - --open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) -+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) - { - int rc; - J1S(rc, array, n); ---- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.h -@@ -63,7 +63,7 @@ namespace open_query - if (!val) - return reset(n); - else -- return setbit(n); -+ return jsetbit(n); - } - - judy_bitset& set(const judy_bitset& src); -@@ -115,7 +115,7 @@ namespace open_query - private: - mutable void* array; - -- judy_bitset& setbit(size_type n); -+ judy_bitset& jsetbit(size_type n); - }; - } - diff --git a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index a292081845ba..000000000000 --- a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ pcre/CMakeLists.txt -@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) - MESSAGE(STATUS "") - ENDIF(PCRE_SHOW_REPORT) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) -+ENDIF() - - # end CMakeLists.txt diff --git a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index b7a5a3912ba6..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ scripts/CMakeLists.txt -@@ -269,6 +269,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() diff --git a/databases/mariadb100-server/files/patch-scripts_mysql__config.sh b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index bbf559927e05..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2015-06-17 14:54:12 UTC -+++ scripts/mysql_config.sh -@@ -109,8 +109,11 @@ fi - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh deleted file mode 100644 index d6f1dcede44d..000000000000 --- a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC -+++ scripts/mysqld_safe.sh -@@ -469,10 +469,10 @@ fi - - if test -z "$MYSQL_HOME" - then -- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" -+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" - then - log_error "WARNING: Found two instances of my.cnf - --$MY_BASEDIR_VERSION/my.cnf and -+$MY_BASEDIR_VERSION/etc/my.cnf and - $DATADIR/my.cnf - IGNORING $DATADIR/my.cnf" - -@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf" - then - log_error "WARNING: Found $DATADIR/my.cnf - The data directory is a deprecated location for my.cnf, please move it to --$MY_BASEDIR_VERSION/my.cnf" -+$MY_BASEDIR_VERSION/etc/my.cnf" - unsafe_my_cnf=1 - MYSQL_HOME=$DATADIR - else diff --git a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index 8f2defac77f8..000000000000 --- a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- sql/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC -+++ sql/CMakeLists.txt -@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean - VERBATIM - ) - -+IF(FALSE) - IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - - # Copy db.opt into data/test/ -@@ -355,6 +356,7 @@ ELSE() - INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) - ENDIF(WIN32 AND MYSQLD_EXECUTABLE) - ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") -+ENDIF() - - IF(WIN32) - SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -397,8 +399,10 @@ IF(WIN32) - TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) - ENDIF(WIN32) - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN examples EXCLUDE - PATTERN share EXCLUDE - PATTERN CMakeFiles EXCLUDE) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-sql_sql__trigger.cc b/databases/mariadb100-server/files/patch-sql_sql__trigger.cc deleted file mode 100644 index 91fdcac66e75..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sql__trigger.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- sql/sql_trigger.cc.orig 2015-06-17 14:54:12 UTC -+++ sql/sql_trigger.cc -@@ -192,32 +192,32 @@ static File_option triggers_file_paramet - { - { - { C_STRING_WITH_LEN("triggers") }, -- my_offsetof(class Table_triggers_list, definitions_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }, - { - { C_STRING_WITH_LEN("definers") }, -- my_offsetof(class Table_triggers_list, definers_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("client_cs_names") }, -- my_offsetof(class Table_triggers_list, client_cs_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("connection_cl_names") }, -- my_offsetof(class Table_triggers_list, connection_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("db_cl_names") }, -- my_offsetof(class Table_triggers_list, db_cl_names), -+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), - FILE_OPTIONS_STRLIST - }, - { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -226,7 +226,7 @@ static File_option triggers_file_paramet - File_option sql_modes_parameters= - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - diff --git a/databases/mariadb100-server/files/patch-sql_sql__view.cc b/databases/mariadb100-server/files/patch-sql_sql__view.cc deleted file mode 100644 index f723c208a05a..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sql__view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2015-06-17 14:54:12 UTC -+++ sql/sql_view.cc -@@ -716,46 +716,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_VIEW_ALGO}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast<int>(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("mariadb-version")}, - my_offsetof(TABLE_LIST, mariadb_version), diff --git a/databases/mariadb100-server/files/patch-sql_sys__vars.cc b/databases/mariadb100-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index 58721ac6b568..000000000000 --- a/databases/mariadb100-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2015-06-17 14:54:13 UTC -+++ sql/sys_vars.cc -@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulonglong Sys_join_buffer_size( - "join_buffer_size", -@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( diff --git a/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp b/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp deleted file mode 100644 index de409349f3e6..000000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/connect/tabmysql.cpp.orig 2017-03-06 20:04:37 UTC -+++ storage/connect/tabmysql.cpp -@@ -335,7 +335,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCST - Delayed = !!GetIntCatInfo("Delayed", 0); - } else { - // MYSQL access from a PROXY table -- Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, "*")); -+ Tabschema = GetStringCatInfo(g, "Database", Tabschema ? Tabschema : PlugDup(g, (PSZ)"*")); - Isview = GetBoolCatInfo("View", false); - - // We must get other connection parms from the calling table diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt deleted file mode 100644 index cd1f2a84bea8..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/tokudb/CMakeLists.txt.orig 2016-02-17 20:59:56 UTC -+++ storage/tokudb/CMakeLists.txt -@@ -131,8 +131,8 @@ SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb") - SET(TOKUDB_SOURCES ha_tokudb.cc) - MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) --SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") --SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE}") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}") - - SET(CPACK_RPM_server_PACKAGE_OBSOLETES - "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake deleted file mode 100644 index 7fe07d8427d2..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake -@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) - endif () - check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) - if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) -- set(CMAKE_REQUIRED_LIBRARIES execinfo) -- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) -- if (HAVE_BACKTRACE_WITH_EXECINFO) -- list(APPEND EXTRA_SYSTEM_LIBS execinfo) -- else () -- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") -- endif () -+ list(APPEND EXTRA_SYSTEM_LIBS execinfo) - endif () - - if(HAVE_CLOCK_REALTIME) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake deleted file mode 100644 index bce1fd09db6f..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake +++ /dev/null @@ -1,37 +0,0 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-02-17 20:59:56 UTC -+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/include") -+ -+ add_library(lzma SHARED IMPORTED) -+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION -+ "/usr/lib/liblzma.so") -+ELSE() - ## add lzma with an external project - set(xz_configure_opts --with-pic --enable-static) - if (APPLE) -@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) - set_target_properties(lzma PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") - add_dependencies(lzma build_lzma) -+ENDIF() - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/local/include") - -+ add_library(snappy SHARED IMPORTED) -+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION -+ "/usr/local/lib/libsnappy.so") -+ELSE() - ## add snappy with an external project - set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") - if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") -@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) - set_target_properties(snappy PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") - add_dependencies(snappy build_snappy) -+ENDIF() diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt deleted file mode 100644 index d0a809928ae0..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2017-01-12 01:45:22 UTC -+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt -@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI - maybe_add_gcov_to_libraries(ft ft_static) - - ## depend on other generated targets --add_dependencies(ft install_tdb_h generate_log_code build_lzma build_snappy) --add_dependencies(ft_static install_tdb_h generate_log_code build_lzma build_snappy) -+add_dependencies(ft install_tdb_h generate_log_code) -+add_dependencies(ft_static install_tdb_h generate_log_code) - - ## link with lzma (which should be static) and link dependers with zlib - target_link_libraries(ft LINK_PRIVATE util_static lzma snappy ${LIBTOKUPORTABILITY}) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc deleted file mode 100644 index 61187db8b0c8..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/PerconaFT/portability/memory.cc -@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: - #include <string.h> - #include <stdio.h> - #include <stdlib.h> --#if defined(HAVE_MALLOC_H) --# include <malloc.h> --#elif defined(HAVE_SYS_MALLOC_H) --# include <sys/malloc.h> --#endif - #include <dlfcn.h> - #include <toku_race_tools.h> - #include "memory.h" diff --git a/databases/mariadb100-server/files/pkg-message.in b/databases/mariadb100-server/files/pkg-message.in deleted file mode 100644 index b49d42074149..000000000000 --- a/databases/mariadb100-server/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -************************************************************************ - -Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) -the first time you start the MySQL server after an upgrade from an -earlier version. - -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. - -This port does NOT include the mytop perl script, this is included in -the MariaDB tarball but the most recent version can be found in the -databases/mytop port - -************************************************************************ |