diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-03-18 21:18:03 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-03-18 21:18:03 +0000 |
| commit | b3098a74ff511e4a0d888651d13012cd028253c5 (patch) | |
| tree | a8be09d9019ee84fee17b8bbeb802a846eb70c4d /databases | |
| parent | 8e1977f39a5cb797e35c71f3d7126d65deb4eeeb (diff) | |
| download | ports-b3098a74ff511e4a0d888651d13012cd028253c5.tar.gz ports-b3098a74ff511e4a0d888651d13012cd028253c5.zip | |
Notes
Diffstat (limited to 'databases')
39 files changed, 1229 insertions, 0 deletions
diff --git a/databases/Makefile b/databases/Makefile index 4ef4a40cfa42..4408bd6575be 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -544,6 +544,8 @@ SUBDIR += percona-toolkit SUBDIR += percona55-client SUBDIR += percona55-server + SUBDIR += percona56-client + SUBDIR += percona56-server SUBDIR += pg_filedump SUBDIR += pg_reorg SUBDIR += pg_rman diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile new file mode 100644 index 000000000000..61f78eccc7cd --- /dev/null +++ b/databases/percona56-client/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= percona +PKGNAMESUFFIX= -client + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../percona56-server + +PKGMESSAGE= mustnotexist +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist + +LATEST_LINK= percona56-client + +CONFLICTS_INSTALL= mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-57-9].* + +CMAKE_ARGS+= -DWITHOUT_SERVER=1 + +USE_LDCONFIG= ${PREFIX}/lib/mysql + +MAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ + mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5815cc145d67 --- /dev/null +++ b/databases/percona56-client/files/patch-CMakeLists.txt @@ -0,0 +1,65 @@ +--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100 +@@ -378,31 +378,11 @@ + 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-uln) +-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) +@@ -439,7 +419,6 @@ + SET(CPACK_GENERATOR "TGZ") + ENDIF() + ADD_SUBDIRECTORY(packaging/WiX) +-ADD_SUBDIRECTORY(packaging/solaris) + + # Create a single package with "make package" + # (see http://public.kitware.com/Bug/view.php?id=11452) +@@ -447,11 +426,11 @@ + + INCLUDE(CPack) + 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} +@@ -477,3 +456,4 @@ + PATTERN "sp-imp-spec.txt" EXCLUDE + ) + ENDIF() ++ENDIF() diff --git a/databases/percona56-client/files/patch-client_CMakeLists.txt b/databases/percona56-client/files/patch-client_CMakeLists.txt new file mode 100644 index 000000000000..f3a7372b69f7 --- /dev/null +++ b/databases/percona56-client/files/patch-client_CMakeLists.txt @@ -0,0 +1,43 @@ +--- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 +@@ -39,9 +39,11 @@ + 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") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) ++ENDIF() + + + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) +@@ -53,15 +55,19 @@ + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) + 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) +@@ -82,8 +88,6 @@ + ENDIF(WIN32) + + SET_TARGET_PROPERTIES ( +- mysql_plugin +- mysql_upgrade + mysqlcheck + mysqldump + mysqlimport diff --git a/databases/percona56-client/files/patch-client__mysql.cc b/databases/percona56-client/files/patch-client__mysql.cc new file mode 100644 index 000000000000..b73e1052d30d --- /dev/null +++ b/databases/percona56-client/files/patch-client__mysql.cc @@ -0,0 +1,16 @@ +--- 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/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..589c0fcaac22 --- /dev/null +++ b/databases/percona56-client/files/patch-cmake_readline.cmake @@ -0,0 +1,11 @@ +--- cmake/readline.cmake.orig 2013-02-13 11:49:33.000000000 +0100 ++++ cmake/readline.cmake 2013-02-13 11:49:56.000000000 +0100 +@@ -192,7 +192,7 @@ + IF(WITH_LIBEDIT) + MYSQL_USE_BUNDLED_LIBEDIT() + ELSE() +- FIND_SYSTEM_LIBEDIT(edit) ++ FIND_SYSTEM_LIBEDIT(readline) + IF(NOT_LIBEDIT_FOUND) + MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") + ENDIF() diff --git a/databases/percona56-client/files/patch-extra_CMakeLists.txt b/databases/percona56-client/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..bd078ede4a7c --- /dev/null +++ b/databases/percona56-client/files/patch-extra_CMakeLists.txt @@ -0,0 +1,25 @@ +--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 +@@ -60,6 +60,7 @@ + ENDIF() + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) +@@ -96,11 +97,14 @@ + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ENDIF() ++ENDIF() + + IF(UNIX) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) diff --git a/databases/percona56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/percona56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp new file mode 100644 index 000000000000..e94bf77c990d --- /dev/null +++ b/databases/percona56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200 ++++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200 +@@ -73,7 +73,7 @@ + CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( + size_type n, const void *) + { +- if (n > max_size()) ++ if (n > AlignedAllocator<T>::max_size()) + return 0; + if (n == 0) + return 0; diff --git a/databases/percona56-client/files/patch-include_my_compare.h b/databases/percona56-client/files/patch-include_my_compare.h new file mode 100644 index 000000000000..093c8ae37789 --- /dev/null +++ b/databases/percona56-client/files/patch-include_my_compare.h @@ -0,0 +1,11 @@ +--- 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/percona56-client/files/patch-include_myisam.h b/databases/percona56-client/files/patch-include_myisam.h new file mode 100644 index 000000000000..450645400dd5 --- /dev/null +++ b/databases/percona56-client/files/patch-include_myisam.h @@ -0,0 +1,11 @@ +--- 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/percona56-client/files/patch-man_CMakeLists.txt b/databases/percona56-client/files/patch-man_CMakeLists.txt new file mode 100644 index 000000000000..0f79f3e2403d --- /dev/null +++ b/databases/percona56-client/files/patch-man_CMakeLists.txt @@ -0,0 +1,13 @@ +--- 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/percona56-client/files/patch-mysys_ssl_my_default.cc b/databases/percona56-client/files/patch-mysys_ssl_my_default.cc new file mode 100644 index 000000000000..f6f38decb8ec --- /dev/null +++ b/databases/percona56-client/files/patch-mysys_ssl_my_default.cc @@ -0,0 +1,31 @@ +--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 ++++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 +@@ -119,7 +119,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; + +@@ -1395,7 +1395,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 +@@ -1466,7 +1469,7 @@ + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. diff --git a/databases/percona56-client/files/patch-scripts_CMakeLists.txt b/databases/percona56-client/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..0235dc2f305f --- /dev/null +++ b/databases/percona56-client/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,93 @@ +--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ scripts/CMakeLists.txt 2013-02-13 14:14:11.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 +@@ -80,6 +81,7 @@ + ${FIX_PRIVILEGES_SQL} + DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server + ) ++ENDIF() + + # TCMalloc hacks + IF(MALLOC_LIB) +@@ -139,6 +141,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}) +@@ -175,6 +178,7 @@ + DESTINATION ${INSTALL_BINDIR} + COMPONENT Server + ) ++ENDIF() + + ENDIF(UNIX) + +@@ -199,6 +203,7 @@ + SET(localstatedir ${MYSQL_DATADIR}) + ENDIF() + ++IF(FALSE) + IF(UNIX) + SET(EXT) + ELSE() +@@ -213,6 +218,7 @@ + DESTINATION ${DEST} + COMPONENT Server + ) ++ENDIF() + + + SET(prefix "${CMAKE_INSTALL_PREFIX}") +@@ -264,6 +270,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,17 +324,9 @@ + SET(BIN_SCRIPTS + msql2mysql + mysql_config +- mysql_fix_extensions +- mysql_setpermission +- 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) +@@ -350,6 +350,7 @@ + ) + ENDFOREACH() + ++IF(FALSE) + # Input files with pl.in extension - drop the extension completely + SET(PLIN_FILES mysql_secure_installation) + FOREACH(file ${PLIN_FILES}) +@@ -362,6 +363,7 @@ + INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) + ENDFOREACH() + ENDIF() ++ENDIF() + + # Install libgcc as mylibgcc.a + IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") diff --git a/databases/percona56-client/files/patch-support-files_CMakeLists.txt b/databases/percona56-client/files/patch-support-files_CMakeLists.txt new file mode 100644 index 000000000000..33803dc525b9 --- /dev/null +++ b/databases/percona56-client/files/patch-support-files_CMakeLists.txt @@ -0,0 +1,36 @@ +--- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100 +@@ -44,14 +44,17 @@ + SET(inst_location ${INSTALL_SUPPORTFILESDIR}) + ENDIF() + ++IF(FALSE) + SET(inifile my-default) + 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) ++ENDIF() + + IF(UNIX) + SET(prefix ${CMAKE_INSTALL_PREFIX}) ++IF(FALSE) + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh + ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) +@@ -68,8 +71,10 @@ + 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) + +@@ -94,3 +99,4 @@ + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + ENDIF() ++ENDIF() diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist new file mode 100644 index 000000000000..9658109c8319 --- /dev/null +++ b/databases/percona56-client/pkg-plist @@ -0,0 +1,99 @@ +bin/msql2mysql +bin/mysql +bin/mysql_config +bin/mysql_config_editor +bin/mysql_find_rows +bin/mysql_waitpid +bin/mysqlaccess +bin/mysqlaccess.conf +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlcheck +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +include/mysql/big_endian.h +include/mysql/byte_order_generic.h +include/mysql/byte_order_generic_x86.h +include/mysql/byte_order_generic_x86_64.h +include/mysql/decimal.h +include/mysql/errmsg.h +include/mysql/keycache.h +include/mysql/little_endian.h +include/mysql/m_ctype.h +include/mysql/m_string.h +include/mysql/my_alloc.h +include/mysql/my_attribute.h +include/mysql/my_byteorder.h +include/mysql/my_compiler.h +include/mysql/my_config.h +include/mysql/my_dbug.h +include/mysql/my_dir.h +include/mysql/my_getopt.h +include/mysql/my_global.h +include/mysql/my_list.h +include/mysql/my_net.h +include/mysql/my_pthread.h +include/mysql/my_sys.h +include/mysql/my_xml.h +include/mysql/mysql.h +include/mysql/mysql/client_authentication.h +include/mysql/mysql/client_plugin.h +include/mysql/mysql/client_plugin.h.pp +include/mysql/mysql/get_password.h +include/mysql/mysql/innodb_priv.h +include/mysql/mysql/plugin.h +include/mysql/mysql/plugin_audit.h +include/mysql/mysql/plugin_audit.h.pp +include/mysql/mysql/plugin_auth.h +include/mysql/mysql/plugin_auth.h.pp +include/mysql/mysql/plugin_auth_common.h +include/mysql/mysql/plugin_ftparser.h +include/mysql/mysql/plugin_ftparser.h.pp +include/mysql/mysql/plugin_validate_password.h +include/mysql/mysql/psi/mysql_file.h +include/mysql/mysql/psi/mysql_idle.h +include/mysql/mysql/psi/mysql_socket.h +include/mysql/mysql/psi/mysql_stage.h +include/mysql/mysql/psi/mysql_statement.h +include/mysql/mysql/psi/mysql_table.h +include/mysql/mysql/psi/mysql_thread.h +include/mysql/mysql/psi/psi.h +include/mysql/mysql/service_my_plugin_log.h +include/mysql/mysql/service_my_snprintf.h +include/mysql/mysql/service_mysql_string.h +include/mysql/mysql/service_thd_alloc.h +include/mysql/mysql/service_thd_wait.h +include/mysql/mysql/service_thread_scheduler.h +include/mysql/mysql/services.h +include/mysql/mysql/thread_pool_priv.h +include/mysql/mysql_com.h +include/mysql/mysql_com_server.h +include/mysql/mysql_embed.h +include/mysql/mysql_time.h +include/mysql/mysql_version.h +include/mysql/mysqld_ername.h +include/mysql/mysqld_error.h +include/mysql/plugin.h +include/mysql/plugin_audit.h +include/mysql/plugin_ftparser.h +include/mysql/plugin_validate_password.h +include/mysql/sql_common.h +include/mysql/sql_state.h +include/mysql/sslopt-case.h +include/mysql/sslopt-longopts.h +include/mysql/sslopt-vars.h +include/mysql/typelib.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.18 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.18 +lib/mysql/libmysqlservices.a +share/aclocal/mysql.m4 +@dirrm include/mysql/mysql/psi +@dirrm include/mysql/mysql +@dirrm include/mysql +@dirrmtry lib/mysql diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile new file mode 100644 index 000000000000..68a841e9351e --- /dev/null +++ b/databases/percona56-server/Makefile @@ -0,0 +1,98 @@ +# $FreeBSD$ + +PORTNAME?= percona +DISTVERSION= 5.6.10-alpha60.2 +PORTREVISION?= 0 +CATEGORIES= databases ipv6 +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/ +PKGNAMESUFFIX?= -server +DISTNAME= Percona-Server-5.6.10-alpha60.2 + +MAINTAINER= ale@FreeBSD.org +COMMENT?= Multithreaded SQL database (server) + +SLAVEDIRS= databases/percona56-client +USE_CMAKE= yes +USES= bison +MAKE_JOBS_SAFE= yes + +OPTIONS_DEFINE= OPENSSL FASTMTX +OPTIONS_DEFAULT= OPENSSL +FASTMTX_DESC= Replace mutexes with spinlocks + +DATADIR= ${PREFIX}/share/mysql +USE_LDCONFIG= ${PREFIX}/lib/mysql + +CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ + -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ + -DINSTALL_INCLUDEDIR="include/mysql" \ + -DINSTALL_INFODIR="info" \ + -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_MANDIR="man" \ + -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ + -DINSTALL_MYSQLSHAREDIR="share/mysql" \ + -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SHAREDIR="share" \ + -DINSTALL_SQLBENCHDIR="share/mysql" \ + -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_LIBEDIT=0 \ + -DWITH_LIBWRAP=1 \ + -DHAVE_PAM=0 + +.ifdef USE_MYSQL +.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.endif + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPENSSL} +CMAKE_ARGS+= -DWITH_SSL=bundled +.endif +.if ${PORT_OPTIONS:MFASTMTX} +CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 +.endif + +# MySQL-Server part +.if !defined(CLIENT_ONLY) +USE_MYSQL= yes +WANT_MYSQL_VER= 56p + +LATEST_LINK= percona56-server + +CONFLICTS_INSTALL= mysql-server-[345].* percona-server-5.[0-57-9].* mariadb-server-[0-9].* + +USE_RC_SUBR= mysql-server + +USERS= mysql +GROUPS= mysql + +INFO= mysql + +MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ + mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ + mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ + mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ + mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 + +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" + +post-install: +.if !defined(PACKAGE_BUILDING) + @${CAT} ${PKGMESSAGE} +.endif +.endif + +post-patch: + @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt + +.include <bsd.port.pre.mk> + +.if ${ARCH} == "arm" +BROKEN= Does not compile on arm +.endif + +.include <bsd.port.post.mk> diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo new file mode 100644 index 000000000000..0113ba4a9426 --- /dev/null +++ b/databases/percona56-server/distinfo @@ -0,0 +1,2 @@ +SHA256 (Percona-Server-5.6.10-alpha60.2.tar.gz) = 25d0e4d309dd9dd6ac6b35363b5c02aa44a5263e46f7b28e4b05a846dbc24eff +SIZE (Percona-Server-5.6.10-alpha60.2.tar.gz) = 32654985 diff --git a/databases/percona56-server/files/mysql-server.in b/databases/percona56-server/files/mysql-server.in new file mode 100644 index 000000000000..fa701dcca45b --- /dev/null +++ b/databases/percona56-server/files/mysql-server.in @@ -0,0 +1,75 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# 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. +# mysql_limits (bool): Set to "NO" by default. +# Set it to yes to run `limits -e -U mysql` +# just before mysql starts. +# mysql_dbdir (str): Default to "/var/db/mysql" +# Base database directory. +# 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"} +: ${mysql_limits="NO"} +: ${mysql_dbdir="/var/db/mysql"} + +mysql_user="mysql" +mysql_limits_args="-e -U ${mysql_user}" +pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} +command="/usr/sbin/daemon" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --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%% --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 + if checkyesno mysql_limits; then + eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null + else + return 0 + fi +} + +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/percona56-server/files/patch-CMakeLists.txt b/databases/percona56-server/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4701b4cb09ef --- /dev/null +++ b/databases/percona56-server/files/patch-CMakeLists.txt @@ -0,0 +1,46 @@ +--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ CMakeLists.txt 2013-02-13 14:40:46.000000000 +0100 +@@ -379,7 +379,6 @@ + + ADD_SUBDIRECTORY(extra) + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql) + ADD_SUBDIRECTORY(sql/share) +@@ -387,14 +386,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() +@@ -439,7 +434,6 @@ + SET(CPACK_GENERATOR "TGZ") + ENDIF() + ADD_SUBDIRECTORY(packaging/WiX) +-ADD_SUBDIRECTORY(packaging/solaris) + + # Create a single package with "make package" + # (see http://public.kitware.com/Bug/view.php?id=11452) +@@ -452,6 +446,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} +@@ -477,3 +472,4 @@ + PATTERN "sp-imp-spec.txt" EXCLUDE + ) + ENDIF() ++ENDIF() diff --git a/databases/percona56-server/files/patch-client_CMakeLists.txt b/databases/percona56-server/files/patch-client_CMakeLists.txt new file mode 100644 index 000000000000..166a94fb3998 --- /dev/null +++ b/databases/percona56-server/files/patch-client_CMakeLists.txt @@ -0,0 +1,65 @@ +--- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100 +@@ -33,17 +33,20 @@ + + 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") + 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) + +@@ -75,6 +82,7 @@ + + MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) + TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) ++ENDIF() + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) +@@ -84,11 +92,6 @@ + SET_TARGET_PROPERTIES ( + mysql_plugin + mysql_upgrade +- mysqlcheck +- mysqldump +- mysqlimport +- mysqlshow +- mysqlslap + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/percona56-server/files/patch-cmake_plugin.cmake b/databases/percona56-server/files/patch-cmake_plugin.cmake new file mode 100644 index 000000000000..c151ea35f4ee --- /dev/null +++ b/databases/percona56-server/files/patch-cmake_plugin.cmake @@ -0,0 +1,10 @@ +--- 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/percona56-server/files/patch-extra_CMakeLists.txt b/databases/percona56-server/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..6bd2fd069171 --- /dev/null +++ b/databases/percona56-server/files/patch-extra_CMakeLists.txt @@ -0,0 +1,13 @@ +--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ extra/CMakeLists.txt 2013-02-13 14:35:11.000000000 +0100 +@@ -102,8 +102,10 @@ + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) + SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX) + ENDIF() ++ENDIF() + diff --git a/databases/percona56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/percona56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp new file mode 100644 index 000000000000..e94bf77c990d --- /dev/null +++ b/databases/percona56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200 ++++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200 +@@ -73,7 +73,7 @@ + CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( + size_type n, const void *) + { +- if (n > max_size()) ++ if (n > AlignedAllocator<T>::max_size()) + return 0; + if (n == 0) + return 0; diff --git a/databases/percona56-server/files/patch-include_CMakeLists.txt b/databases/percona56-server/files/patch-include_CMakeLists.txt new file mode 100644 index 000000000000..5d5e96a0f1d7 --- /dev/null +++ b/databases/percona56-server/files/patch-include_CMakeLists.txt @@ -0,0 +1,15 @@ +--- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100 +@@ -65,10 +65,12 @@ + ${HEADERS_GEN_CONFIGURE} + ) + ++IF(FALSE) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development + PATTERN "*.h" + PATTERN "psi_abi*" EXCLUDE + ) ++ENDIF() + + diff --git a/databases/percona56-server/files/patch-include_my_compare.h b/databases/percona56-server/files/patch-include_my_compare.h new file mode 100644 index 000000000000..093c8ae37789 --- /dev/null +++ b/databases/percona56-server/files/patch-include_my_compare.h @@ -0,0 +1,11 @@ +--- 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/percona56-server/files/patch-include_myisam.h b/databases/percona56-server/files/patch-include_myisam.h new file mode 100644 index 000000000000..450645400dd5 --- /dev/null +++ b/databases/percona56-server/files/patch-include_myisam.h @@ -0,0 +1,11 @@ +--- 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/percona56-server/files/patch-libmysql_CMakeLists.txt b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt new file mode 100644 index 000000000000..7f11bedc9e43 --- /dev/null +++ b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt @@ -0,0 +1,36 @@ +--- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 ++++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 +@@ -153,13 +153,14 @@ + + # 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) + INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + ENDIF() + ++IF(FALSE) + IF(UNIX) + MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) + SET(DOT_VERSION ".${VERSION}") +@@ -174,9 +175,11 @@ + 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} COMPONENT SharedLibraries) ++ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) ++IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -223,3 +226,4 @@ + ENDFOREACH() + ENDIF() + ENDIF() ++ENDIF() diff --git a/databases/percona56-server/files/patch-libservices_CMakeLists.txt b/databases/percona56-server/files/patch-libservices_CMakeLists.txt new file mode 100644 index 000000000000..fcbcea7aed21 --- /dev/null +++ b/databases/percona56-server/files/patch-libservices_CMakeLists.txt @@ -0,0 +1,9 @@ +--- 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/percona56-server/files/patch-man_CMakeLists.txt b/databases/percona56-server/files/patch-man_CMakeLists.txt new file mode 100644 index 000000000000..7849c77af111 --- /dev/null +++ b/databases/percona56-server/files/patch-man_CMakeLists.txt @@ -0,0 +1,11 @@ +--- 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/percona56-server/files/patch-mysys_ssl_my_default.cc b/databases/percona56-server/files/patch-mysys_ssl_my_default.cc new file mode 100644 index 000000000000..f6f38decb8ec --- /dev/null +++ b/databases/percona56-server/files/patch-mysys_ssl_my_default.cc @@ -0,0 +1,31 @@ +--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 ++++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 +@@ -119,7 +119,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; + +@@ -1395,7 +1395,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 +@@ -1466,7 +1469,7 @@ + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. diff --git a/databases/percona56-server/files/patch-scripts_CMakeLists.txt b/databases/percona56-server/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..ef7b3a1b506b --- /dev/null +++ b/databases/percona56-server/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,36 @@ +--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 +@@ -264,6 +264,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() +@@ -314,15 +316,10 @@ + # 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_zap +- mysqlaccess +- mysqlaccess.conf + mysql_convert_table_format +- mysql_find_rows + mysqlhotcopy + mysqldumpslow + mysqld_multi +@@ -331,7 +328,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/percona56-server/files/patch-scripts_mysqld_safe.sh b/databases/percona56-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..2a30469922f0 --- /dev/null +++ b/databases/percona56-server/files/patch-scripts_mysqld_safe.sh @@ -0,0 +1,24 @@ +--- 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/percona56-server/files/patch-sql_CMakeLists.txt b/databases/percona56-server/files/patch-sql_CMakeLists.txt new file mode 100644 index 000000000000..e4d1b520c529 --- /dev/null +++ b/databases/percona56-server/files/patch-sql_CMakeLists.txt @@ -0,0 +1,18 @@ +--- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100 ++++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100 +@@ -245,6 +245,7 @@ + + IF(INSTALL_LAYOUT STREQUAL "STANDALONE") + ++IF(FALSE) + # We need to create empty directories (data/test) the installation. + # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 + # Avoid completely empty directories and install dummy file instead. +@@ -286,6 +287,7 @@ + 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/percona56-server/files/patch-sql_mysqld.cc b/databases/percona56-server/files/patch-sql_mysqld.cc new file mode 100644 index 000000000000..9eee54ba3ff5 --- /dev/null +++ b/databases/percona56-server/files/patch-sql_mysqld.cc @@ -0,0 +1,20 @@ +--- sql/mysqld.cc.orig 2013-03-05 00:04:54.000000000 +0100 ++++ sql/mysqld.cc 2013-03-18 09:55:35.499120018 +0100 +@@ -6291,7 +6291,7 @@ + + #ifdef HAVE_LIBWRAP + { +- if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock)) ++ if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock)) + { + struct request_info req; + signal(SIGCHLD, SIG_DFL); +@@ -6323,7 +6323,7 @@ + The connection was refused by TCP wrappers. + There are no details (by client IP) available to update the host_cache. + */ +- statistic_increment(connection_tcpwrap_errors, &LOCK_status); ++ statistic_increment(connection_errors_tcpwrap, &LOCK_status); + continue; + } + } diff --git a/databases/percona56-server/files/patch-sql_sys_vars.cc b/databases/percona56-server/files/patch-sql_sys_vars.cc new file mode 100644 index 000000000000..e8f0caff4aff --- /dev/null +++ b/databases/percona56-server/files/patch-sql_sys_vars.cc @@ -0,0 +1,38 @@ +--- 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/percona56-server/files/patch-support-files_CMakeLists.txt b/databases/percona56-server/files/patch-support-files_CMakeLists.txt new file mode 100644 index 000000000000..159e1fa71ba2 --- /dev/null +++ b/databases/percona56-server/files/patch-support-files_CMakeLists.txt @@ -0,0 +1,12 @@ +--- 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) diff --git a/databases/percona56-server/pkg-descr b/databases/percona56-server/pkg-descr new file mode 100644 index 000000000000..8f4acf36e853 --- /dev/null +++ b/databases/percona56-server/pkg-descr @@ -0,0 +1,4 @@ +MySQL is a very fast, multi-threaded, multi-user and robust SQL +(Structured Query Language) database server. + +WWW: http://www.mysql.com/ diff --git a/databases/percona56-server/pkg-message b/databases/percona56-server/pkg-message new file mode 100644 index 000000000000..71d00aa80526 --- /dev/null +++ b/databases/percona56-server/pkg-message @@ -0,0 +1,6 @@ +************************************************************************ + +Remember to run mysql_upgrade the first time you start the MySQL server +after an upgrade from an earlier version. + +************************************************************************ diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist new file mode 100644 index 000000000000..436978b38b79 --- /dev/null +++ b/databases/percona56-server/pkg-plist @@ -0,0 +1,132 @@ +@stopdaemon mysql-server +bin/innochecksum +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql_convert_table_format +bin/mysql_fix_extensions +bin/mysql_install_db +bin/mysql_plugin +bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade +bin/mysql_zap +bin/mysqlbug +bin/mysqld_multi +bin/mysqld_safe +bin/mysqldumpslow +bin/mysqlhotcopy +bin/mysqltest +bin/perror +bin/replace +bin/resolve_stack_dump +bin/resolveip +lib/mysql/libmysqld.a +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth.so +lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/qa_auth_client.so +lib/mysql/plugin/qa_auth_interface.so +lib/mysql/plugin/qa_auth_server.so +lib/mysql/plugin/semisync_master.so +lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/validate_password.so +libexec/mysqld +%%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/dictionary.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/errmsg-utf8.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/innodb_memcached_config.sql +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/magic +%%DATADIR%%/my-default.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql.server +%%DATADIR%%/mysql_security_commands.sql +%%DATADIR%%/mysql_system_tables.sql +%%DATADIR%%/mysql_system_tables_data.sql +%%DATADIR%%/mysql_test_data_timezone.sql +%%DATADIR%%/mysqld_multi.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.sys +@dirrm lib/mysql/plugin +@dirrmtry lib/mysql +@dirrm %%DATADIR%%/bulgarian +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@dirrm %%DATADIR%% |