diff options
Diffstat (limited to 'databases/percona55-client/files')
11 files changed, 0 insertions, 359 deletions
diff --git a/databases/percona55-client/files/patch-CMakeLists.txt b/databases/percona55-client/files/patch-CMakeLists.txt deleted file mode 100644 index a8d1a604788b..000000000000 --- a/databases/percona55-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,72 +0,0 @@ ---- CMakeLists.txt.orig 2015-11-02 16:25:51 UTC -+++ CMakeLists.txt -@@ -403,33 +403,11 @@ IF(WITH_UNIT_TESTS) - ENDIF() - - ADD_SUBDIRECTORY(extra) --IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) -- ADD_SUBDIRECTORY(client) -- ADD_SUBDIRECTORY(sql) -- ADD_SUBDIRECTORY(sql/share) -- ADD_SUBDIRECTORY(libservices) -- 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() -- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) -- ADD_SUBDIRECTORY(internal) -- ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-oel) -- ADD_SUBDIRECTORY(packaging/rpm-sles) -- ADD_SUBDIRECTORY(packaging/rpm-docker) --ENDIF() -+ADD_SUBDIRECTORY(client) -+ADD_SUBDIRECTORY(libservices) -+ADD_SUBDIRECTORY(support-files) -+ADD_SUBDIRECTORY(scripts) -+ADD_SUBDIRECTORY(man) - - INCLUDE(cmake/abi_check.cmake) - INCLUDE(cmake/tags.cmake) -@@ -466,19 +444,21 @@ IF(WIN32) - 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) - SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - - IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -504,6 +484,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/percona55-client/files/patch-client_CMakeLists.txt b/databases/percona55-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index d2b0c9812aa5..000000000000 --- a/databases/percona55-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ ---- client/CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100 -+++ client/CMakeLists.txt 2015-01-21 20:03:30.747577544 +0100 -@@ -33,6 +33,7 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - # mysqltest has unused result errors, so we skip Werror -@@ -42,7 +43,7 @@ - ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error") - ENDIF() - TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) -- -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) -@@ -53,15 +54,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc - ../sql/rpl_filter.cc ../sql/sql_list.cc) -@@ -79,7 +84,7 @@ - MYSQL_ADD_EXECUTABLE(echo echo.c) - ENDIF(WIN32) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/percona55-client/files/patch-client__mysql.cc b/databases/percona55-client/files/patch-client__mysql.cc deleted file mode 100644 index b73e1052d30d..000000000000 --- a/databases/percona55-client/files/patch-client__mysql.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- client/mysql.cc.orig 2012-02-27 19:15:22.271243107 +0000 -+++ client/mysql.cc 2012-02-27 19:16:16.645241508 +0000 -@@ -1601,11 +1601,11 @@ - #endif - - #ifdef HAVE_READLINE -- printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n", -+ printf("%s Ver %s Distrib %s Percona, for %s (%s) using %s %s\n", - my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE, - readline, rl_library_version); - #else -- printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, -+ printf("%s Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER, - MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); - #endif - diff --git a/databases/percona55-client/files/patch-extra_CMakeLists.txt b/databases/percona55-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 46df238a3d9e..000000000000 --- a/databases/percona55-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ ---- extra/CMakeLists.txt.orig 2015-07-25 11:30:53 UTC -+++ extra/CMakeLists.txt -@@ -50,6 +50,7 @@ ADD_CUSTOM_TARGET(GenError - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys - ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -69,12 +70,15 @@ ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) - TARGET_LINK_LIBRARIES(innochecksum ${ZLIB_LIBRARY}) - - 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) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) diff --git a/databases/percona55-client/files/patch-include_CMakeLists.txt b/databases/percona55-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 02ae2db9f708..000000000000 --- a/databases/percona55-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100 -+++ include/CMakeLists.txt 2011-02-07 22:42:05.129894470 +0100 -@@ -27,9 +27,6 @@ - my_list.h - my_alloc.h - typelib.h -- mysql/plugin.h -- mysql/plugin_audit.h -- mysql/plugin_ftparser.h - ) - - SET(HEADERS diff --git a/databases/percona55-client/files/patch-include_my_compare.h b/databases/percona55-client/files/patch-include_my_compare.h deleted file mode 100644 index 093c8ae37789..000000000000 --- a/databases/percona55-client/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/percona55-client/files/patch-include_myisam.h b/databases/percona55-client/files/patch-include_myisam.h deleted file mode 100644 index 450645400dd5..000000000000 --- a/databases/percona55-client/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/percona55-client/files/patch-man_CMakeLists.txt b/databases/percona55-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 0f79f3e2403d..000000000000 --- a/databases/percona55-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 -@@ -15,10 +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) - IF(MAN1_EXCLUDE) - LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/percona55-client/files/patch-mysys_default.c b/databases/percona55-client/files/patch-mysys_default.c deleted file mode 100644 index 816105371bdf..000000000000 --- a/databases/percona55-client/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/percona55-client/files/patch-scripts_CMakeLists.txt b/databases/percona55-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 4dd4080c4f5f..000000000000 --- a/databases/percona55-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ scripts/CMakeLists.txt 2011-01-11 20:18:07.000000000 +0100 -@@ -71,6 +71,7 @@ - ) - ENDIF() - -+IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -79,6 +80,7 @@ - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server - ) -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -138,6 +140,7 @@ - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -174,6 +177,7 @@ - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -198,6 +202,7 @@ - SET(localstatedir ${MYSQL_DATADIR}) - ENDIF() - -+IF() - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -215,6 +220,7 @@ - DESTINATION ${DEST} - COMPONENT Server - ) -+ENDIF() - - - SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -266,6 +272,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() -@@ -318,18 +326,9 @@ - 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 -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) diff --git a/databases/percona55-client/files/patch-support-files_CMakeLists.txt b/databases/percona55-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index f5d11500eeda..000000000000 --- a/databases/percona55-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-08-18 12:24:50 UTC -+++ support-files/CMakeLists.txt -@@ -40,12 +40,14 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) - ENDFOREACH() -+ENDIF() - - IF(UNIX) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") -@@ -54,6 +56,7 @@ IF(UNIX) - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure - config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh -@@ -73,8 +76,10 @@ IF(UNIX) - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() -+ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+IF(FALSE) - 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) - -@@ -99,3 +104,4 @@ IF(UNIX) - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() |