diff options
Diffstat (limited to 'databases/mysql55-server/files')
23 files changed, 0 insertions, 669 deletions
diff --git a/databases/mysql55-server/files/extra-patch-config.h.cmake b/databases/mysql55-server/files/extra-patch-config.h.cmake deleted file mode 100644 index 3ac1add1b9ce..000000000000 --- a/databases/mysql55-server/files/extra-patch-config.h.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.cmake.orig 2014-12-05 16:24:02 UTC -+++ config.h.cmake -@@ -151,7 +151,8 @@ - #cmakedefine HAVE_FESETROUND 1 - #cmakedefine HAVE_FINITE 1 - #cmakedefine HAVE_FP_EXCEPT 1 --#cmakedefine HAVE_FPSETMASK 1 -+#cmakedefine HAVE_FPSETMASK 0 -+#cmakedefine HAVE_FEDISABLEEXCEPT 1 - #cmakedefine HAVE_FSEEKO 1 - #cmakedefine HAVE_FSYNC 1 - #cmakedefine HAVE_FTIME 1 diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in deleted file mode 100644 index 6e9ca18040a6..000000000000 --- a/databases/mysql55-server/files/mysql-server.in +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_pidfile (str): Custum PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - 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}` 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/mysql55-server/files/patch-CMakeLists.txt b/databases/mysql55-server/files/patch-CMakeLists.txt deleted file mode 100644 index 59e1a4126599..000000000000 --- a/databases/mysql55-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 -+++ CMakeLists.txt 2013-06-12 09:41:06.000000000 +0200 -@@ -306,7 +306,6 @@ - - ADD_SUBDIRECTORY(extra) - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) -@@ -314,14 +313,10 @@ - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) -- ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() -@@ -365,8 +360,10 @@ - ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() -+IF(FALSE) - ADD_SUBDIRECTORY(packaging/WiX) - ADD_SUBDIRECTORY(packaging/solaris) -+ENDIF() - - # Create a single package with "make package" - # (see http://public.kitware.com/Bug/view.php?id=11452) -@@ -379,6 +376,7 @@ - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -404,3 +402,4 @@ - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index fc496933828e..000000000000 --- a/databases/mysql55-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ ---- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000 -+++ client/CMakeLists.txt 2014-12-03 09:23:56.610710083 +0000 -@@ -27,11 +27,13 @@ - - ADD_DEFINITIONS(${READLINE_DEFINES}) - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) - 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 mysqlclient regex) - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -52,17 +55,21 @@ - - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - 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,13 +79,14 @@ - 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) - ENDIF(WIN32) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc deleted file mode 100644 index 5a03f22b249f..000000000000 --- a/databases/mysql55-server/files/patch-client_mysql.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n - #ifdef HAVE_LOCALE_H - setlocale(LC_ALL,""); /* so as libedit use isprint */ - #endif -- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; -- rl_completion_entry_function= &no_completion; -+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; -+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; -+ /* - rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); -+ */ - #else - rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; - rl_completion_entry_function= &no_completion; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const - int end MY_ATTRIBUTE((unused))) - { - if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) -+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) - return rl_completion_matches(text, new_command_generator); - #else - return completion_matches((char *)text, (CPFunction *)new_command_generator); diff --git a/databases/mysql55-server/files/patch-cmake_plugin.cmake b/databases/mysql55-server/files/patch-cmake_plugin.cmake deleted file mode 100644 index c151ea35f4ee..000000000000 --- a/databases/mysql55-server/files/patch-cmake_plugin.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 -+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 -@@ -195,7 +195,6 @@ - OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") - # Install dynamic library - MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) -- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" diff --git a/databases/mysql55-server/files/patch-extra_CMakeLists.txt b/databases/mysql55-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index f8f555f5e0e8..000000000000 --- a/databases/mysql55-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- extra/CMakeLists.txt.orig 2010-12-23 17:38:06.000000000 +0100 -+++ extra/CMakeLists.txt 2010-12-23 17:38:51.000000000 +0100 -@@ -75,7 +75,9 @@ - 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) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - ENDIF() -+ENDIF() - diff --git a/databases/mysql55-server/files/patch-include_CMakeLists.txt b/databases/mysql55-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index 2478ae5fa6e3..000000000000 --- a/databases/mysql55-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100 -+++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100 -@@ -57,5 +57,7 @@ - ${HEADERS_GEN_CONFIGURE} - ) - -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") -+ENDIF() diff --git a/databases/mysql55-server/files/patch-include_my_compare.h b/databases/mysql55-server/files/patch-include_my_compare.h deleted file mode 100644 index 093c8ae37789..000000000000 --- a/databases/mysql55-server/files/patch-include_my_compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 -+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 -@@ -39,7 +39,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 16 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mysql55-server/files/patch-include_myisam.h b/databases/mysql55-server/files/patch-include_myisam.h deleted file mode 100644 index 450645400dd5..000000000000 --- a/databases/mysql55-server/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 -+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 -@@ -48,7 +48,7 @@ - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 9d7dfc81fbaa..000000000000 --- a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2014-03-14 18:58:32.000000000 +0000 -+++ libmysql/CMakeLists.txt 2014-03-31 12:19:56.265410574 +0000 -@@ -165,7 +165,7 @@ - - # 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 - INSTALL_DEBUG_SYMBOLS(clientlib) -@@ -180,6 +180,7 @@ - SET(${out_name} ${name}) - ENDMACRO() - -+IF(FALSE) - IF(UNIX) - MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) - SET(DOT_VERSION ".${VERSION}") -@@ -200,11 +201,13 @@ - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a - ${INSTALL_LIBDIR} Development) - ENDIF() -+ENDIF() - - IF(NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -261,3 +264,4 @@ - ENDFOREACH() - ENDIF() - ENDIF() -+ENDIF() diff --git a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt b/databases/mysql55-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index fcbcea7aed21..000000000000 --- a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100 -+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 -@@ -22,4 +22,6 @@ - my_thread_scheduler_service.c) - - ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mysql55-server/files/patch-man_CMakeLists.txt b/databases/mysql55-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 7849c77af111..000000000000 --- a/databases/mysql55-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200 -@@ -15,8 +15,6 @@ - - # Copy man pages - FILE(GLOB MAN1_FILES *.1) --FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) --FILE(GLOB MAN1_NDB ndb*.1) - FILE(GLOB MAN8_FILES *.8) - FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c deleted file mode 100644 index 816105371bdf..000000000000 --- a/databases/mysql55-server/files/patch-mysys_default.c +++ /dev/null @@ -1,31 +0,0 @@ ---- mysys/default.c.orig 2010-11-02 23:01:13.000000000 +0100 -+++ mysys/default.c 2010-11-10 16:39:51.000000000 +0100 -@@ -70,7 +70,7 @@ - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -711,7 +711,7 @@ - { - 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 -@@ -1153,7 +1153,10 @@ - - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) -+ { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); -+ } - #endif /* DEFAULT_SYSCONFDIR */ - - #endif diff --git a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt b/databases/mysql55-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index de410a1d3549..000000000000 --- a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 +0200 -+++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200 -@@ -266,6 +266,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -316,16 +318,11 @@ - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - SET(BIN_SCRIPTS -- msql2mysql -- mysql_config - mysql_fix_extensions - mysql_setpermission - mysql_secure_installation - mysql_zap -- mysqlaccess -- mysqlaccess.conf - mysql_convert_table_format -- mysql_find_rows - mysqlhotcopy - mysqldumpslow - mysqld_multi -@@ -334,7 +331,7 @@ - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh -- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) - ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} - ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh deleted file mode 100644 index 2a30469922f0..000000000000 --- a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 -+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 -@@ -242,10 +242,10 @@ - - 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" - -@@ -254,7 +254,7 @@ - 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" - MYSQL_HOME=$DATADIR - else - MYSQL_HOME=$MY_BASEDIR_VERSION diff --git a/databases/mysql55-server/files/patch-sql_CMakeLists.txt b/databases/mysql55-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index 41d8905bd519..000000000000 --- a/databases/mysql55-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- sql/CMakeLists.txt.orig 2013-03-25 14:14:58.000000000 +0100 -+++ sql/CMakeLists.txt 2013-04-19 14:57:41.000000000 +0200 -@@ -261,6 +261,7 @@ ADD_CUSTOM_TARGET(distclean - - IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - -+IF(FALSE) - # Copy db.opt into data/test/ - SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) - INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) -@@ -301,6 +302,7 @@ ELSE() - INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) - ENDIF() - ENDIF() -+ENDIF() - - ADD_CUSTOM_TARGET(show-dist-name - COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" diff --git a/databases/mysql55-server/files/patch-sql_common_client_plugin.c b/databases/mysql55-server/files/patch-sql_common_client_plugin.c deleted file mode 100644 index 069eaef76e11..000000000000 --- a/databases/mysql55-server/files/patch-sql_common_client_plugin.c +++ /dev/null @@ -1,47 +0,0 @@ ---- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC -+++ sql-common/client_plugin.c -@@ -233,11 +233,13 @@ - { - MYSQL mysql; - struct st_mysql_client_plugin **builtin; -+ va_list unused; - - if (initialized) - return 0; - - bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ - - pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); - init_alloc_root(&mem_root, 128, 128); -@@ -249,7 +251,7 @@ - pthread_mutex_lock(&LOCK_load_client_plugin); - - for (builtin= mysql_client_builtins; *builtin; builtin++) -- add_plugin(&mysql, *builtin, 0, 0, 0); -+ add_plugin(&mysql, *builtin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - -@@ -293,9 +295,12 @@ - mysql_client_register_plugin(MYSQL *mysql, - struct st_mysql_client_plugin *plugin) - { -+ va_list unused; - if (is_not_initialized(mysql, plugin->name)) - return NULL; - -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ -+ - pthread_mutex_lock(&LOCK_load_client_plugin); - - /* make sure the plugin wasn't loaded meanwhile */ -@@ -307,7 +312,7 @@ - plugin= NULL; - } - else -- plugin= add_plugin(mysql, plugin, 0, 0, 0); -+ plugin= add_plugin(mysql, plugin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - return plugin; diff --git a/databases/mysql55-server/files/patch-sql_sql_partition.cc b/databases/mysql55-server/files/patch-sql_sql_partition.cc deleted file mode 100644 index 11c62230ac6c..000000000000 --- a/databases/mysql55-server/files/patch-sql_sql_partition.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/sql_partition.cc.orig 2018-05-14 15:35:48.089983000 +0200 -+++ sql/sql_partition.cc 2018-05-14 15:36:03.185749000 +0200 -@@ -283,7 +283,7 @@ - } - } - part_info->set_up_defaults_for_partitioning(table->file, -- (ulonglong)0, (uint)0); -+ NULL, 0U); - DBUG_RETURN(FALSE); - } - diff --git a/databases/mysql55-server/files/patch-sql_sql_trigger.cc b/databases/mysql55-server/files/patch-sql_sql_trigger.cc deleted file mode 100644 index 7e308976b3ec..000000000000 --- a/databases/mysql55-server/files/patch-sql_sql_trigger.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 -+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 -@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= - { - { - { 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_parameters[]= - 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/mysql55-server/files/patch-sql_sql_view.cc b/databases/mysql55-server/files/patch-sql_sql_view.cc deleted file mode 100644 index 5f4d92d7eebf..000000000000 --- a/databases/mysql55-server/files/patch-sql_sql_view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200 -+++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200 -@@ -730,46 +730,46 @@ static const int required_view_parameters= 14; - */ - 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_ULONGLONG}, - {{ 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}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} diff --git a/databases/mysql55-server/files/patch-sql_sys_vars.cc b/databases/mysql55-server/files/patch-sql_sys_vars.cc deleted file mode 100644 index e8f0caff4aff..000000000000 --- a/databases/mysql55-server/files/patch-sql_sys_vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 -+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 -@@ -900,7 +900,7 @@ - "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_ulong Sys_join_buffer_size( - "join_buffer_size", -@@ -1401,7 +1401,7 @@ - "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)); - -@@ -1416,7 +1416,7 @@ - "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)); - -@@ -2257,7 +2257,7 @@ - "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)); - - /** propagates changes to the relevant flag of @@optimizer_switch */ diff --git a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt b/databases/mysql55-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 159e1fa71ba2..000000000000 --- a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100 -+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100 -@@ -74,7 +74,9 @@ - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) |