diff options
Diffstat (limited to 'databases/mariadb100-client/files')
14 files changed, 0 insertions, 322 deletions
diff --git a/databases/mariadb100-client/files/patch-CMakeLists.txt b/databases/mariadb100-client/files/patch-CMakeLists.txt deleted file mode 100644 index 707584ed11dd..000000000000 --- a/databases/mariadb100-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 -+++ CMakeLists.txt 2017-05-23 20:47:01.403482000 +0200 -@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(libservices) - ADD_SUBDIRECTORY(scripts) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) -@@ -425,6 +425,7 @@ IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(internal) - ENDIF() - ENDIF() -+ENDIF() - - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -480,6 +481,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 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb100-client/files/patch-client_CMakeLists.txt b/databases/mariadb100-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 34a11073dc6d..000000000000 --- a/databases/mariadb100-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-01-29 18:39:34 UTC -+++ client/CMakeLists.txt -@@ -39,12 +39,13 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ENDIF() - -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) --TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) -+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) - SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -81,10 +86,12 @@ IF(WIN32) - ENDIF(WIN32) - - # async_example is just a code example, do not install it. -+IF(FALSE) - 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 (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-client/files/patch-cmake_ssl.cmake b/databases/mariadb100-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0414d663f59c..000000000000 --- a/databases/mariadb100-client/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-client/files/patch-extra_CMakeLists.txt b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 63e2e96f9bb6..000000000000 --- a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ extra/CMakeLists.txt -@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -74,9 +75,12 @@ ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -@@ -100,7 +104,9 @@ ENDIF() - ../storage/innobase/page/page0zip.cc - ) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) -+ENDIF() - diff --git a/databases/mariadb100-client/files/patch-include_CMakeLists.txt b/databases/mariadb100-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index db795a5a93ce..000000000000 --- a/databases/mariadb100-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ include/CMakeLists.txt -@@ -66,16 +66,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I - 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") -+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "psi_abi*" EXCLUDE -+) - - 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() - - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb100-client/files/patch-include_my__compare.h b/databases/mariadb100-client/files/patch-include_my__compare.h deleted file mode 100644 index 788176ec99c7..000000000000 --- a/databases/mariadb100-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2017-01-12 01:45:16 UTC -+++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { - 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-client/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 69c35e1aecc6..000000000000 --- a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ libmysql/CMakeLists.txt -@@ -479,6 +479,8 @@ IF(NOT DISABLE_SHARED) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") -+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") -+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") - ELSE() diff --git a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 3d519797d81f..000000000000 --- a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2017-01-12 01:45:16 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-client/files/patch-man_CMakeLists.txt b/databases/mariadb100-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 32274e8bf45a..000000000000 --- a/databases/mariadb100-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- man/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ man/CMakeLists.txt -@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) - SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1) - -+IF(FALSE) - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+ENDIF() - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) -+IF(FALSE) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -+ENDIF() - diff --git a/databases/mariadb100-client/files/patch-mysys_my__default.c b/databases/mariadb100-client/files/patch-mysys_my__default.c deleted file mode 100644 index 70ab3073cf64..000000000000 --- a/databases/mariadb100-client/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-client/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index 1c7f87d89399..000000000000 --- a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2017-01-12 01:45:18 UTC -+++ pcre/CMakeLists.txt -@@ -509,6 +509,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-client/files/patch-scripts_mysql__config.sh b/databases/mariadb100-client/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 4254a0cf9b24..000000000000 --- a/databases/mariadb100-client/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 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-client/files/patch-sql_CMakeLists.txt b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt deleted file mode 100644 index 5e9fa44d640d..000000000000 --- a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC -+++ sql/CMakeLists.txt -@@ -247,9 +247,9 @@ RUN_BISON( - ) - - # Gen_lex_hash --IF(NOT CMAKE_CROSSCOMPILING) -+ - ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) --ENDIF() -+ - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h diff --git a/databases/mariadb100-client/files/pkg-message.in b/databases/mariadb100-client/files/pkg-message.in deleted file mode 100644 index 8bea32f83491..000000000000 --- a/databases/mariadb100-client/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ -************************************************************************ - -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. - -************************************************************************ |