diff options
| author | John Marino <marino@FreeBSD.org> | 2014-11-04 08:21:55 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-11-04 08:21:55 +0000 |
| commit | d2bcf058dc37256369bad9b9a1157fc76c059467 (patch) | |
| tree | 72ab3bccf2944cb7cd4cc6703c6db257586e3e02 | |
| parent | Remove deprecated KDE4=kdehier (diff) | |
Add new ports databases/mariadb100-server and -client (version 10.0)
PR: 193539
Submitted by: spil.oss (gmail)
MariaDB is a database server that offers drop-in replacement functionality
for MySQL. MariaDB is built by some of the original authors of MySQL, with
assistance from the broader community of Free and open source software
developers. In addition to the core functionality of MySQL, MariaDB offers
a rich set of feature enhancements including alternate storage engines,
server optimizations, and patches.
52 files changed, 1739 insertions, 1 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 9f4342078fd3..68eb5bd4d6bf 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -129,10 +129,11 @@ MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 +MYSQL100m_LIBVER= 18 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) -_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/' +_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' _PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l @@ -172,6 +173,9 @@ _MYSQL_SERVER= databases/mariadb-server .elif (${MYSQL_VER} == "55m") _MYSQL_CLIENT= databases/mariadb55-client _MYSQL_SERVER= databases/mariadb55-server +.elif (${MYSQL_VER} == "100m") +_MYSQL_CLIENT= databases/mariadb100-client +_MYSQL_SERVER= databases/mariadb100-server .elif (${MYSQL_VER} == "55p") _MYSQL_CLIENT= databases/percona55-client _MYSQL_SERVER= databases/percona55-server diff --git a/databases/Makefile b/databases/Makefile index 04ab67afbdba..83ecf040a54f 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -163,6 +163,8 @@ SUBDIR += mariadb-client SUBDIR += mariadb-scripts SUBDIR += mariadb-server + SUBDIR += mariadb100-client + SUBDIR += mariadb100-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile new file mode 100644 index 000000000000..729ca9482df0 --- /dev/null +++ b/databases/mariadb100-client/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= mariadb +PKGNAMESUFFIX= 100-client + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../mariadb100-server + +FILESDIR= ${.CURDIR}/files +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist + +CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* \ + mariadb[0-46-9][0-9]-client-* \ + mariadb5.[0-46-9]-client-* \ + percona[0-9][0-9]-client-* + +CMAKE_ARGS+= -DWITHOUT_SERVER=1 + +USE_LDCONFIG= ${PREFIX}/lib/mysql + +CLIENT_ONLY= yes + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb100-client/files/patch-CMakeLists.txt b/databases/mariadb100-client/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a346520af0dc --- /dev/null +++ b/databases/mariadb100-client/files/patch-CMakeLists.txt @@ -0,0 +1,55 @@ +--- CMakeLists.txt.orig 2014-09-25 00:29:47.000000000 +0200 ++++ CMakeLists.txt 2014-09-27 09:57:32.000000000 +0200 +@@ -430,28 +430,8 @@ + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(scripts) +-ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(support-files) + +-IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) +- ADD_SUBDIRECTORY(sql) +- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) +- IF(WITH_EMBEDDED_SERVER) +- ADD_SUBDIRECTORY(libmysqld) +- ADD_SUBDIRECTORY(libmysqld/examples) +- ENDIF(WITH_EMBEDDED_SERVER) +- +- ADD_SUBDIRECTORY(mysql-test) +- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +- ADD_SUBDIRECTORY(sql-bench) +- +- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) +- ADD_SUBDIRECTORY(internal) +- ENDIF() +- ADD_SUBDIRECTORY(packaging/rpm-oel) +-ENDIF() +- + IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() +@@ -463,7 +443,6 @@ + ADD_SUBDIRECTORY(win/upgrade_wizard) + ADD_SUBDIRECTORY(win/packaging) + ENDIF() +-ADD_SUBDIRECTORY(packaging/solaris) + + IF(NOT CMAKE_CROSSCOMPILING) + SET(EXPORTED comp_err comp_sql factorial) +@@ -506,6 +485,7 @@ + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + ++IF(FALSE) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT + COMPONENT Readme) + +@@ -516,6 +496,7 @@ + IF(UNIX) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + ENDIF() ++ENDIF() + + INCLUDE(CPack) + diff --git a/databases/mariadb100-client/files/patch-client_CMakeLists.txt b/databases/mariadb100-client/files/patch-client_CMakeLists.txt new file mode 100644 index 000000000000..7acc3e306f79 --- /dev/null +++ b/databases/mariadb100-client/files/patch-client_CMakeLists.txt @@ -0,0 +1,57 @@ +--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 ++++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 +@@ -38,11 +38,12 @@ + SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) + ENDIF(UNIX) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) + SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) +- ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) +@@ -53,21 +54,25 @@ + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) + TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) +-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) ++tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -79,10 +84,12 @@ + ENDIF(WIN32) + + # async_example is just a code example, do not install it. ++IF(FALSE) + ADD_EXECUTABLE(async_example async_example.c) + TARGET_LINK_LIBRARIES(async_example mysqlclient) ++ENDIF() + +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake new file mode 100644 index 000000000000..aea0487ba809 --- /dev/null +++ b/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake @@ -0,0 +1,18 @@ +--- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 ++++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 +@@ -24,12 +24,12 @@ + SET(what system) + ENDIF() + +- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES) + + IF (HAVE_JEMALLOC) +- SET(LIBJEMALLOC ${libname}) +- SET(MALLOC_LIBRARY "${what} jemalloc") ++ SET(LIBJEMALLOC c) ++ SET(MALLOC_LIBRARY "system jemalloc") + ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") + MESSAGE(FATAL_ERROR "${libname} is not found") + ENDIF() diff --git a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..f08649d6ed04 --- /dev/null +++ b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt @@ -0,0 +1,25 @@ +--- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200 ++++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200 +@@ -54,6 +54,7 @@ + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) + TARGET_LINK_LIBRARIES(my_print_defaults mysys) + +@@ -74,11 +75,14 @@ + + MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) + TARGET_LINK_LIBRARIES(replace mysys) ++ENDIF() + IF(UNIX) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) + + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys) diff --git a/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp new file mode 100644 index 000000000000..214edfd8834a --- /dev/null +++ b/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 ++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 +@@ -75,7 +75,7 @@ + CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( + size_type n, const void *) + { +- if (n > this->max_size()) ++ if (n > AlignedAllocator<T>::max_size()) + return 0; + if (n == 0) + return 0; diff --git a/databases/mariadb100-client/files/patch-include_CMakeLists.txt b/databases/mariadb100-client/files/patch-include_CMakeLists.txt new file mode 100644 index 000000000000..e4c1761275ca --- /dev/null +++ b/databases/mariadb100-client/files/patch-include_CMakeLists.txt @@ -0,0 +1,22 @@ +--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 ++++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 +@@ -58,13 +58,18 @@ + FOREACH(f ${HEADERS_GEN_CONFIGURE}) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + ENDFOREACH(f) +-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") ++INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development ++ FILES_MATCHING PATTERN "*.h" ++ PATTERN "psi_abi*" EXCLUDE ++) + + STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") + STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) ++ENDIF() diff --git a/databases/mariadb100-client/files/patch-include_my_compare.h b/databases/mariadb100-client/files/patch-include_my_compare.h new file mode 100644 index 000000000000..ad948aa1b5db --- /dev/null +++ b/databases/mariadb100-client/files/patch-include_my_compare.h @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200 ++++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200 +@@ -40,7 +40,7 @@ + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt new file mode 100644 index 000000000000..5b7f086a93ae --- /dev/null +++ b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt @@ -0,0 +1,11 @@ +--- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC ++++ libmysql/CMakeLists.txt +@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ++ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") ++ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") + ELSE() diff --git a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt new file mode 100644 index 000000000000..beb30eb10a81 --- /dev/null +++ b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt @@ -0,0 +1,9 @@ +--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 ++++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200 +@@ -29,4 +29,6 @@ + logger_service.c) + + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() diff --git a/databases/mariadb100-client/files/patch-man_CMakeLists.txt b/databases/mariadb100-client/files/patch-man_CMakeLists.txt new file mode 100644 index 000000000000..09dd6e3b0f7d --- /dev/null +++ b/databases/mariadb100-client/files/patch-man_CMakeLists.txt @@ -0,0 +1,16 @@ +--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 ++++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 +@@ -30,9 +30,13 @@ + SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 + mysqltest_embedded.1 mysql_client_test_embedded.1) + ++IF(FALSE) + INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) + INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) ++ENDIF() + INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) + INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) ++IF(FALSE) + INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) ++ENDIF() + diff --git a/databases/mariadb100-client/files/patch-mysys_my_default.c b/databases/mariadb100-client/files/patch-mysys_my_default.c new file mode 100644 index 000000000000..fef69528a070 --- /dev/null +++ b/databases/mariadb100-client/files/patch-mysys_my_default.c @@ -0,0 +1,61 @@ +--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 ++++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 +@@ -90,7 +90,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; + +@@ -785,7 +785,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 +@@ -803,6 +803,14 @@ + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + return 1; /* Ignore wrong files */ + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1067,7 +1075,8 @@ + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1223,13 +1232,10 @@ + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + diff --git a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt new file mode 100644 index 000000000000..2c46f7484de7 --- /dev/null +++ b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt @@ -0,0 +1,11 @@ +--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 ++++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 +@@ -513,6 +513,8 @@ + MESSAGE(STATUS "") + ENDIF(PCRE_SHOW_REPORT) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) ++ENDIF() + + # end CMakeLists.txt diff --git a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..729f635ef36e --- /dev/null +++ b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,78 @@ +--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 ++++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 +@@ -72,6 +72,7 @@ + ) + ENDIF() + ++IF(FALSE) + INSTALL(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql + ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql +@@ -81,6 +82,7 @@ + ${FIX_PRIVILEGES_SQL} + DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server + ) ++ENDIF() + + # TCMalloc hacks + IF(MALLOC_LIB) +@@ -140,6 +142,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}) +@@ -180,6 +183,7 @@ + DESTINATION ${INSTALL_BINDIR} + COMPONENT Server + ) ++ENDIF() + + ENDIF(UNIX) + +@@ -204,6 +208,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) +@@ -219,6 +224,7 @@ + COMPONENT Server + ) + ENDIF() ++ENDIF() + + SET(prefix "${CMAKE_INSTALL_PREFIX}") + IF(INSTALL_SYSCONFDIR) +@@ -281,6 +287,8 @@ + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) + ENDIF() ++ ELSEIF(lib STREQUAL "-pthread") ++ SET(${var} "${${var}}-pthread " ) + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() +@@ -339,18 +347,8 @@ + SET(BIN_SCRIPTS + msql2mysql + mysql_config +- mysql_fix_extensions +- mysql_setpermission +- mysql_secure_installation +- mysql_zap + mysqlaccess +- mysql_convert_table_format + mysql_find_rows +- mytop +- mysqlhotcopy +- mysqldumpslow +- mysqld_multi +- mysqld_safe + ) + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) diff --git a/databases/mariadb100-client/files/patch-scripts_mysql_config.sh b/databases/mariadb100-client/files/patch-scripts_mysql_config.sh new file mode 100644 index 000000000000..5271d5256b8f --- /dev/null +++ b/databases/mariadb100-client/files/patch-scripts_mysql_config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 ++++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 +@@ -108,8 +108,11 @@ + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC diff --git a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt new file mode 100644 index 000000000000..4c14473d5e2d --- /dev/null +++ b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt @@ -0,0 +1,14 @@ +--- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200 ++++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200 +@@ -226,9 +226,9 @@ + ) + + # Gen_lex_hash +-IF(NOT CMAKE_CROSSCOMPILING) ++ + ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) +-ENDIF() ++ + + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h diff --git a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt new file mode 100644 index 000000000000..314bf0b121fe --- /dev/null +++ b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt @@ -0,0 +1,48 @@ +--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 ++++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 +@@ -41,15 +41,18 @@ + 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) + 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 ) +@@ -67,8 +70,10 @@ + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 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) + +@@ -92,6 +97,7 @@ + DESTINATION ${inst_location} COMPONENT SupportFiles + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++ + + IF (INSTALL_SYSCONFDIR) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d +@@ -101,6 +107,7 @@ + RENAME mysql COMPONENT SupportFiles + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++ ENDIF() + + INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} + COMPONENT Common) diff --git a/databases/mariadb100-client/files/pkg-message.in b/databases/mariadb100-client/files/pkg-message.in new file mode 100644 index 000000000000..8bea32f83491 --- /dev/null +++ b/databases/mariadb100-client/files/pkg-message.in @@ -0,0 +1,7 @@ +************************************************************************ + +MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for +my.cnf. Please move existing my.cnf files from those paths to +%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. + +************************************************************************ diff --git a/databases/mariadb100-client/pkg-plist b/databases/mariadb100-client/pkg-plist new file mode 100644 index 000000000000..f098dab1aea5 --- /dev/null +++ b/databases/mariadb100-client/pkg-plist @@ -0,0 +1,104 @@ +bin/msql2mysql +bin/mysql +bin/mysql_config +bin/mysql_find_rows +bin/mysql_waitpid +bin/mysqlaccess +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlcheck +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +include/mysql/auth_dialog_client.h +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/client_plugin.h +include/mysql/decimal.h +include/mysql/errmsg.h +include/mysql/handler_ername.h +include/mysql/handler_state.h +include/mysql/keycache.h +include/mysql/little_endian.h +include/mysql/m_ctype.h +include/mysql/m_string.h +include/mysql/ma_dyncol.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_decimal_limits.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_valgrind.h +include/mysql/my_xml.h +include/mysql/mysql.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_auth.h +include/mysql/plugin_auth_common.h +include/mysql/plugin_ftparser.h +include/mysql/psi/mysql_file.h +include/mysql/psi/mysql_idle.h +include/mysql/psi/mysql_socket.h +include/mysql/psi/mysql_stage.h +include/mysql/psi/mysql_statement.h +include/mysql/psi/mysql_table.h +include/mysql/psi/mysql_thread.h +include/mysql/psi/psi.h +include/mysql/service_debug_sync.h +include/mysql/service_kill_statement.h +include/mysql/service_logger.h +include/mysql/service_my_plugin_log.h +include/mysql/service_my_snprintf.h +include/mysql/service_progress_report.h +include/mysql/service_sha1.h +include/mysql/service_thd_alloc.h +include/mysql/service_thd_autoinc.h +include/mysql/service_thd_error_context.h +include/mysql/service_thd_timezone.h +include/mysql/service_thd_wait.h +include/mysql/services.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 +man/man1/msql2mysql.1.gz +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile new file mode 100644 index 000000000000..90eab068a094 --- /dev/null +++ b/databases/mariadb100-server/Makefile @@ -0,0 +1,157 @@ +# $FreeBSD$ + +PORTNAME?= mariadb +PORTVERSION= 10.0.14 +CATEGORIES= databases ipv6 +MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ + http://mirrors.supportex.net/${SITESDIR}/ \ + http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ + http://gd.tuwien.ac.at/db/${SITESDIR}/ \ + http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ + http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ + http://mirror.layerjet.com/${SITESDIR}/ \ + http://mirror.switch.ch/mirror/${SITESDIR}/ +PKGNAMESUFFIX?= 100-server + +MAINTAINER= spil.oss@gmail.com +COMMENT?= Multithreaded SQL database (server) + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +SLAVEDIRS= databases/mariadb100-client +USES= bison:build cmake execinfo gmake shebangfix +SHEBANG_FILES= scripts/*.sh +SITESDIR= mariadb/mariadb-${PORTVERSION}/source + +BROKEN_arm= Does not compile on arm + +OPTIONS_DEFINE= SSL OPENSSL PORTSSL FASTMTX +OPTIONS_DEFAULT= SSL +NO_OPTIONS_SORT= yes + +FASTMTX_DESC= Replace mutexes with spinlocks +OPENSSL_DESC= Use OpenSSL instead of bundled yassl +PORTSSL_DESC= Use OpenSSL from port (requires OPENSSL to be set) + +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= \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SHAREDIR="share" \ + -DINSTALL_SQLBENCHDIR= \ + -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_UNIT_TESTS=0 \ + -DWITH_LIBEDIT=0 \ + -DWITH_LIBWRAP=1 \ + -DEXECINFO_ROOT=${LOCALBASE} \ + -DCOMPILATION_COMMENT="FreeBSD Ports" + +.ifdef USE_MYSQL +.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again. +.endif + +DATADIR= ${PREFIX}/share/mysql + +# MySQL-Server options +.if !defined(CLIENT_ONLY) +USE_MYSQL= yes +OPTIONS_DEFINE+= OQGRAPH MAXKEY +OPTIONS_DEFAULT+= MAXKEY + +OQGRAPH_DESC= Open Query Graph Computation engine +MAXKEY_DESC= Change max key length from 1000 to 4000 +.endif + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +CMAKE_ARGS+= -DWITH_JEMALLOC="system" +.else +CMAKE_ARGS+= -DWITH_JEMALLOC="no" +.endif + +.if ${PORT_OPTIONS:MSSL} +. if exists(${LOCALBASE}/include/openssl/opensslv.h) +. if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL} +IGNORE= security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl +. endif +. endif +. if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes +. if !${PORT_OPTIONS:MPORTSSL} +WITH_OPENSSL_BASE= yes +. else +WITH_OPENSSL_PORT= yes +. endif +CMAKE_ARGS+= -DWITH_SSL=yes +. else +CMAKE_ARGS+= -DWITH_SSL=bundled +. endif +.else +CMAKE_FLAGS+= -DWITH_SSL=no +.endif + +.if ${PORT_OPTIONS:MFASTMTX} +CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 +.endif + +# MySQL-Client part +.if defined(CLIENT_ONLY) +USES+= readline +.else +# MySQL-Server part + +CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-* + +USE_MYSQL= yes +WANT_MYSQL_VER= 100m +USE_RC_SUBR= mysql-server +USERS= mysql +GROUPS= mysql +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ + -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 + +. if empty(PORT_OPTIONS:MOQGRAPH) +CMAKE_ARGS+= -DWITHOUT_OQGRAPH=1 +PLIST_SUB+= OQGRAPH="@comment " +. else +USE_GCC?= yes +CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1 +PLIST_SUB+= OQGRAPH="" +LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs +. endif +. if ${PORT_OPTIONS:MMAXKEY} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h +. endif + +post-install: + # Remove programs to avoid conflict with mariadb100-client + # These are "client" components, so there should be a switch that + # prevents them from being installed but it's unknown right now + ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ + ${STAGEDIR}${PREFIX}/bin/mysql_config \ + ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ + ${STAGEDIR}${PREFIX}/bin/mysqlaccess +.endif + +post-patch: + @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh +.if ${OPSYS} == DragonFly + ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ + ${WRKSRC}/cmake/os/DragonFly.cmake + ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb +.endif + +.include <bsd.port.mk> diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo new file mode 100644 index 000000000000..fc3024491750 --- /dev/null +++ b/databases/mariadb100-server/distinfo @@ -0,0 +1,2 @@ +SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d +SIZE (mariadb-10.0.14.tar.gz) = 51156364 diff --git a/databases/mariadb100-server/files/extra-patch-include_my_compare.h b/databases/mariadb100-server/files/extra-patch-include_my_compare.h new file mode 100644 index 000000000000..5fc447b98cd7 --- /dev/null +++ b/databases/mariadb100-server/files/extra-patch-include_my_compare.h @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 ++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 +@@ -40,7 +40,7 @@ + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb100-server/files/mysql-server.in b/databases/mariadb100-server/files/mysql-server.in new file mode 100644 index 000000000000..5f5603f2f575 --- /dev/null +++ b/databases/mariadb100-server/files/mysql-server.in @@ -0,0 +1,139 @@ +#!/bin/sh + +# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ +# +# PROVIDE: mysql +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_(instance_)?enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysql_(instance_)?limits (bool): Set to "NO" by default. +# Set it to yes to run `limits -e -U mysql` +# just before mysql starts. +# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" +# Base database directory. +# mysql_(instance_)?args (str): Custom additional arguments to be passed +# to mysqld_safe (default empty). +# mysql_(instance_)?pidfile (str): Custum PID file path and name. +# Default to "${mysql_dbdir}/${hostname}.pid". +# mysql_(instance_)?user (str): User to run mysqld as +# Default to "mysql" created by the port +# mysql_(instance_)?optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". +# mysql_instances (str): Set to "" by default. +# If defined, list of instances to enable + +. /etc/rc.subr + +name="mysql" +rcvar=mysql_enable + +load_rc_config $name + +: ${mysql_enable="NO"} +: ${mysql_limits="NO"} +: ${mysql_user="mysql"} +: ${mysql_limits_args="-e -U $mysql_user"} +: ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} + +command="/usr/sbin/daemon" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" +start_postcmd="${name}_poststart" + +if [ -n "$2" ]; then + instance="$2" + load_rc_config ${name}_${instance} + case "$mysql_instances" in + "$2 "*|*" $2 "*|*" $2"|"$2") + eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" + eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" + eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" + eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" + eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" + ;; + *) + err 1 "$2 not found in mysql_instances" ;; + esac +else + if [ -n "${mysql_instances}" -a -n "$1" ]; then + for instance in ${mysql_instances}; do + eval _enable="\${mysql_${instance}_enable}" + case "${_enable:-${mysql_enable}}" in + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + continue + ;; + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + ;; + *) + if [ -z "$_enable" ]; then + _var=mysql_enable + else + _var=mysql_${instance}_enable + fi + warn "Bad value" \ + "'${_enable:-${mysql_enable}}'" \ + "for ${_var}. " \ + "Instance ${instance} skipped." + continue + ;; + esac + echo "===> mysql instance: ${instance}" + if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then + success="${instance} ${success}" + else + failed="${instance} (${retcode}) ${failed}" + fi + done + exit 0 + else + mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} + fi +fi + +pidfile=$mysql_pidfile +mysql_install_db="%%PREFIX%%/bin/mysql_install_db" +mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" + +mysql_create_auth_tables() +{ + eval $mysql_install_db $mysql_install_db_args + [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} +} + +mysql_prestart() +{ + local dir + for dir in /etc /etc/mysql; do + if [ -f "${dir}/my.cnf" ]; then + echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" + return 1 + fi + done + if [ ! -d "${mysql_dbdir}/mysql/." ]; then + mysql_create_auth_tables || return 1 + fi + if checkyesno mysql_limits; then + eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 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/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f6efa9d9682a --- /dev/null +++ b/databases/mariadb100-server/files/patch-CMakeLists.txt @@ -0,0 +1,26 @@ +--- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 ++++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200 +@@ -463,7 +463,6 @@ + ADD_SUBDIRECTORY(win/upgrade_wizard) + ADD_SUBDIRECTORY(win/packaging) + ENDIF() +-ADD_SUBDIRECTORY(packaging/solaris) + + IF(NOT CMAKE_CROSSCOMPILING) + SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) +@@ -503,6 +502,7 @@ + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + ++IF(FALSE) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT + COMPONENT Readme) + INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC +@@ -511,6 +511,7 @@ + IF(UNIX) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + ENDIF() ++ENDIF() + + INCLUDE(CPack) + diff --git a/databases/mariadb100-server/files/patch-client_CMakeLists.txt b/databases/mariadb100-server/files/patch-client_CMakeLists.txt new file mode 100644 index 000000000000..4b8f071eac27 --- /dev/null +++ b/databases/mariadb100-server/files/patch-client_CMakeLists.txt @@ -0,0 +1,70 @@ +--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 ++++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 +@@ -30,6 +30,7 @@ + COPY_OPENSSL_DLLS(copy_openssl_client) + + ADD_DEFINITIONS(${SSL_DEFINES}) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc + ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) + TARGET_LINK_LIBRARIES(mysql mysqlclient) +@@ -37,6 +38,7 @@ + TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) + SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) + ENDIF(UNIX) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -44,6 +46,7 @@ + SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + +@@ -52,17 +55,21 @@ + + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) + TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) + +@@ -72,17 +79,20 @@ + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) ++ENDIF() + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) + MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) + ENDIF(WIN32) + ++IF(FALSE) + # async_example is just a code example, do not install it. + ADD_EXECUTABLE(async_example async_example.c) + TARGET_LINK_LIBRARIES(async_example mysqlclient) ++ENDIF() + +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake new file mode 100644 index 000000000000..aea0487ba809 --- /dev/null +++ b/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake @@ -0,0 +1,18 @@ +--- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 ++++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 +@@ -24,12 +24,12 @@ + SET(what system) + ENDIF() + +- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES) + + IF (HAVE_JEMALLOC) +- SET(LIBJEMALLOC ${libname}) +- SET(MALLOC_LIBRARY "${what} jemalloc") ++ SET(LIBJEMALLOC c) ++ SET(MALLOC_LIBRARY "system jemalloc") + ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") + MESSAGE(FATAL_ERROR "${libname} is not found") + ENDIF() diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..7a53775810bb --- /dev/null +++ b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt @@ -0,0 +1,11 @@ +--- extra/CMakeLists.txt.orig 2014-08-09 00:13:40.000000000 +0200 ++++ extra/CMakeLists.txt 2014-09-05 18:32:20.555373233 +0200 +@@ -80,6 +80,8 @@ + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + ENDIF() ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp new file mode 100644 index 000000000000..214edfd8834a --- /dev/null +++ b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 ++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 +@@ -75,7 +75,7 @@ + CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( + size_type n, const void *) + { +- if (n > this->max_size()) ++ if (n > AlignedAllocator<T>::max_size()) + return 0; + if (n == 0) + return 0; diff --git a/databases/mariadb100-server/files/patch-include_CMakeLists.txt b/databases/mariadb100-server/files/patch-include_CMakeLists.txt new file mode 100644 index 000000000000..ef405d749892 --- /dev/null +++ b/databases/mariadb100-server/files/patch-include_CMakeLists.txt @@ -0,0 +1,24 @@ +--- include/CMakeLists.txt.orig 2014-08-09 00:13:38.000000000 +0200 ++++ include/CMakeLists.txt 2014-09-05 18:38:18.461346954 +0200 +@@ -62,17 +62,21 @@ + handler_ername.h + ) + ++IF(FALSE) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + FOREACH(f ${HEADERS_GEN_CONFIGURE}) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + ENDFOREACH(f) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") ++ENDIF() + + STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") + STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt new file mode 100644 index 000000000000..00813cb9fa00 --- /dev/null +++ b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt @@ -0,0 +1,39 @@ +--- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 ++++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 +@@ -403,7 +403,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 + IF(MSVC) +@@ -411,6 +411,7 @@ + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) + ENDIF() + ++IF(FALSE) + IF(UNIX) + MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) + SET(DOT_VERSION ".${VERSION}") +@@ -425,11 +426,13 @@ + ENDMACRO() + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) + ENDIF() ++ENDIF() + + IF(NOT DISABLE_SHARED) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) ++IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -477,3 +480,4 @@ + ENDFOREACH() + ENDIF() + ENDIF() ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt new file mode 100644 index 000000000000..a5c78814c6a8 --- /dev/null +++ b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt @@ -0,0 +1,9 @@ +--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 ++++ libservices/CMakeLists.txt 2014-09-05 18:48:40.074297131 +0200 +@@ -29,4 +29,6 @@ + logger_service.c) + + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-man_CMakeLists.txt b/databases/mariadb100-server/files/patch-man_CMakeLists.txt new file mode 100644 index 000000000000..873a4fbdad04 --- /dev/null +++ b/databases/mariadb100-server/files/patch-man_CMakeLists.txt @@ -0,0 +1,12 @@ +--- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300 ++++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300 +@@ -33,7 +33,8 @@ + + INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) + INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) ++IF(FALSE) + INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) + INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) + INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) +- ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-mysys_my_default.c b/databases/mariadb100-server/files/patch-mysys_my_default.c new file mode 100644 index 000000000000..fef69528a070 --- /dev/null +++ b/databases/mariadb100-server/files/patch-mysys_my_default.c @@ -0,0 +1,61 @@ +--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 ++++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 +@@ -90,7 +90,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; + +@@ -785,7 +785,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 +@@ -803,6 +803,14 @@ + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + return 1; /* Ignore wrong files */ + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1067,7 +1075,8 @@ + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1223,13 +1232,10 @@ + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + diff --git a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt new file mode 100644 index 000000000000..2c46f7484de7 --- /dev/null +++ b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt @@ -0,0 +1,11 @@ +--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 ++++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 +@@ -513,6 +513,8 @@ + MESSAGE(STATUS "") + ENDIF(PCRE_SHOW_REPORT) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) ++ENDIF() + + # end CMakeLists.txt diff --git a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..d0892e1219f2 --- /dev/null +++ b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,11 @@ +--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 ++++ scripts/CMakeLists.txt 2014-09-05 19:06:46.206250221 +0200 +@@ -281,6 +281,8 @@ + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) + ENDIF() ++ ELSEIF(lib STREQUAL "-pthread") ++ SET(${var} "${${var}}-pthread " ) + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() diff --git a/databases/mariadb100-server/files/patch-scripts_mysql_config.sh b/databases/mariadb100-server/files/patch-scripts_mysql_config.sh new file mode 100644 index 000000000000..5271d5256b8f --- /dev/null +++ b/databases/mariadb100-server/files/patch-scripts_mysql_config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 ++++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 +@@ -108,8 +108,11 @@ + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..57811043cb33 --- /dev/null +++ b/databases/mariadb100-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 +@@ -235,10 +235,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" + +@@ -247,7 +247,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/mariadb100-server/files/patch-sql_CMakeLists.txt b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt new file mode 100644 index 000000000000..7805e56701ab --- /dev/null +++ b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt @@ -0,0 +1,29 @@ +--- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 ++++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 +@@ -278,6 +278,7 @@ + VERBATIM + ) + ++IF(FALSE) + IF(INSTALL_LAYOUT STREQUAL "STANDALONE") + + # Copy db.opt into data/test/ +@@ -321,6 +322,7 @@ + INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) + ENDIF(WIN32 AND MYSQLD_EXECUTABLE) + ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") ++ENDIF() + + IF(WIN32) + SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) +@@ -363,8 +365,10 @@ + TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) + ENDIF(WIN32) + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN examples EXCLUDE + PATTERN share EXCLUDE + PATTERN CMakeFiles EXCLUDE) ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-sql_sql_trigger.cc b/databases/mariadb100-server/files/patch-sql_sql_trigger.cc new file mode 100644 index 000000000000..be49b1f5f758 --- /dev/null +++ b/databases/mariadb100-server/files/patch-sql_sql_trigger.cc @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000 ++++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000 +@@ -192,32 +192,32 @@ + { + { + { 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 @@ + File_option sql_modes_parameters= + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + diff --git a/databases/mariadb100-server/files/patch-sql_sql_view.cc b/databases/mariadb100-server/files/patch-sql_sql_view.cc new file mode 100644 index 000000000000..8b6d0b84579f --- /dev/null +++ b/databases/mariadb100-server/files/patch-sql_sql_view.cc @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 ++++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 +@@ -742,46 +742,46 @@ + */ + static File_option view_parameters[]= + {{{ C_STRING_WITH_LEN("query")}, +- my_offsetof(TABLE_LIST, select_stmt), ++ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast<int>(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_VIEW_ALGO}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast<int>(my_offsetof(TABLE_LIST, source)), + FILE_OPTIONS_ESTRING}, + {{(char*) STRING_WITH_LEN("client_cs_name")}, +- my_offsetof(TABLE_LIST, view_client_cs_name), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("connection_cl_name")}, +- my_offsetof(TABLE_LIST, view_connection_cl_name), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("view_body_utf8")}, +- my_offsetof(TABLE_LIST, view_body_utf8), ++ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{NullS, 0}, 0, + FILE_OPTIONS_STRING} diff --git a/databases/mariadb100-server/files/patch-sql_sys_vars.cc b/databases/mariadb100-server/files/patch-sql_sys_vars.cc new file mode 100644 index 000000000000..c0027d356f5c --- /dev/null +++ b/databases/mariadb100-server/files/patch-sql_sys_vars.cc @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2014-08-09 00:13:37.000000000 +0200 ++++ sql/sys_vars.cc 2014-09-05 19:30:55.609134039 +0200 +@@ -1012,7 +1012,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_ulonglong Sys_join_buffer_size( + "join_buffer_size", +@@ -2044,7 +2044,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)); + +@@ -2059,7 +2059,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)); + +@@ -3288,7 +3288,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)); + + static Sys_var_plugin Sys_default_storage_engine( diff --git a/databases/mariadb100-server/files/patch-storage_connect_array.cpp b/databases/mariadb100-server/files/patch-storage_connect_array.cpp new file mode 100644 index 000000000000..3968f4ff377e --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_connect_array.cpp @@ -0,0 +1,11 @@ +--- storage/connect/array.cpp.orig 2014-09-25 00:29:47.000000000 +0200 ++++ storage/connect/array.cpp 2014-09-27 12:00:33.000000000 +0200 +@@ -129,7 +129,7 @@ + break; + case TYPE_VOID: + // Integer stored inside pp->Value +- par->AddValue(g, (int)parmp->Value); ++ par->AddValue(g, *(int*)parmp->Value); + break; + } // endswitch valtyp + diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp b/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp new file mode 100644 index 000000000000..3a082bc01d90 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp @@ -0,0 +1,20 @@ +--- storage/connect/filamap.cpp.orig 2014-09-25 00:29:47.000000000 +0200 ++++ storage/connect/filamap.cpp 2014-09-27 11:46:06.000000000 +0200 +@@ -288,7 +288,7 @@ + /***********************************************************************/ + /* Initialize Fpos and Mempos for indexed DELETE. */ + /***********************************************************************/ +-int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos) ++int MAPFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos) + { + Fpos = Memory + fpos; + Mempos = Memory + spos; +@@ -683,7 +683,7 @@ + /***********************************************************************/ + /* Initialize CurBlk, CurNum, Mempos and Fpos for indexed DELETE. */ + /***********************************************************************/ +-int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos) ++int MPXFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos) + { + Fpos = Memory + Headlen + fpos * Lrecl; + Mempos = Fpos + Lrecl; diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.h b/databases/mariadb100-server/files/patch-storage_connect_filamap.h new file mode 100644 index 000000000000..a3cca7da1a5d --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_connect_filamap.h @@ -0,0 +1,27 @@ +--- storage/connect/filamap.h.orig 2014-09-25 00:29:47.000000000 +0200 ++++ storage/connect/filamap.h 2014-09-27 11:44:39.000000000 +0200 +@@ -47,7 +47,7 @@ + virtual void Rewind(void); + + protected: +- virtual int InitDelete(PGLOBAL g, int fpos, int spos); ++ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos); + + // Members + char *Memory; // Pointer on file mapping view. +@@ -104,13 +104,13 @@ + virtual int MaxBlkSize(PGLOBAL g, int s) + {return TXTFAM::MaxBlkSize(g, s);} + virtual bool SetPos(PGLOBAL g, int recpos); +- virtual int GetNextPos(void) {return (int)Fpos + Nrec;} ++ virtual int GetNextPos(void) {return (uintptr_t)Fpos + Nrec;} + virtual bool DeferReading(void) {return false;} + virtual int ReadBuffer(PGLOBAL g); + virtual int WriteBuffer(PGLOBAL g); + + protected: +- virtual int InitDelete(PGLOBAL g, int fpos, int spos); ++ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos); + + // No additional members + }; // end of class MPXFAM diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake new file mode 100644 index 000000000000..8325f3ebe216 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake @@ -0,0 +1,17 @@ +--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2014-09-24 22:29:47 UTC ++++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake +@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) + endif () + check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) + if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) +- set(CMAKE_REQUIRED_LIBRARIES execinfo) +- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) +- if (HAVE_BACKTRACE_WITH_EXECINFO) +- list(APPEND EXTRA_SYSTEM_LIBS execinfo) +- else () +- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") +- endif () ++ list(APPEND EXTRA_SYSTEM_LIBS execinfo) + endif () + + if(HAVE_CLOCK_REALTIME) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc new file mode 100644 index 000000000000..b03b0eba5303 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc @@ -0,0 +1,14 @@ +--- storage/tokudb/ft-index/portability/memory.cc.orig 2014-09-24 22:29:47 UTC ++++ storage/tokudb/ft-index/portability/memory.cc +@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: + #include <string.h> + #include <stdio.h> + #include <stdlib.h> +-#if defined(HAVE_MALLOC_H) +-# include <malloc.h> +-#elif defined(HAVE_SYS_MALLOC_H) +-# include <sys/malloc.h> +-#endif + #include <dlfcn.h> + #include <toku_race_tools.h> + #include "memory.h" diff --git a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt new file mode 100644 index 000000000000..70154e20b3b0 --- /dev/null +++ b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt @@ -0,0 +1,15 @@ +--- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 ++++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 +@@ -66,10 +66,11 @@ + ENDFOREACH() + IF(INSTALL_SUPPORTFILESDIR) + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) +- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 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) + diff --git a/databases/mariadb100-server/files/pkg-message.in b/databases/mariadb100-server/files/pkg-message.in new file mode 100644 index 000000000000..060c6c66c17f --- /dev/null +++ b/databases/mariadb100-server/files/pkg-message.in @@ -0,0 +1,11 @@ +************************************************************************ + +Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) +the first time you start the MySQL server after an upgrade from an +earlier version. + +MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for +my.cnf. Please move existing my.cnf files from those paths to +%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. + +************************************************************************ diff --git a/databases/mariadb100-server/pkg-descr b/databases/mariadb100-server/pkg-descr new file mode 100644 index 000000000000..31c3ca1ce897 --- /dev/null +++ b/databases/mariadb100-server/pkg-descr @@ -0,0 +1,14 @@ +MariaDB is a database server that offers drop-in replacement functionality +for MySQL. MariaDB is built by some of the original authors of MySQL, with +assistance from the broader community of Free and open source software +developers. In addition to the core functionality of MySQL, MariaDB offers +a rich set of feature enhancements including alternate storage engines, +server optimizations, and patches. + +MariaDB is primarily driven by developers at Monty Program, a company +founded by Michael "Monty" Widenius, the original author of MySQL, but +this is not the whole story about MariaDB. On the "About MariaDB" page you +will find more information about all participants in the MariaDB community, +including storage engines XtraDB and PBXT. + +WWW: http://mariadb.org/ diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist new file mode 100644 index 000000000000..a439714dd61d --- /dev/null +++ b/databases/mariadb100-server/pkg-plist @@ -0,0 +1,173 @@ +@stopdaemon mysql-server +bin/aria_chk +bin/aria_dump_log +bin/aria_ftdump +bin/aria_pack +bin/aria_read_log +bin/innochecksum +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql_client_test +bin/mysql_client_test_embedded +bin/mysql_convert_table_format +bin/mysql_embedded +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/mysqltest_embedded +bin/mytop +bin/perror +bin/replace +bin/resolve_stack_dump +bin/resolveip +include/mysql/private/embedded_priv.h +lib/mysql/libmysqld.a +lib/mysql/libmysqld.so +lib/mysql/libmysqld.so.18 +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth_0x0100.so +lib/mysql/plugin/auth_pam.so +lib/mysql/plugin/auth_socket.so +lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/dialog.so +lib/mysql/plugin/dialog_examples.so +lib/mysql/plugin/feedback.so +lib/mysql/plugin/ha_archive.so +lib/mysql/plugin/ha_blackhole.so +lib/mysql/plugin/ha_connect.so +lib/mysql/plugin/ha_federated.so +lib/mysql/plugin/ha_federatedx.so +lib/mysql/plugin/ha_innodb.so +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so +lib/mysql/plugin/ha_sequence.so +lib/mysql/plugin/ha_sphinx.so +lib/mysql/plugin/ha_spider.so +lib/mysql/plugin/ha_test_sql_discovery.so +lib/mysql/plugin/handlersocket.so +lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/locales.so +lib/mysql/plugin/metadata_lock_info.so +lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/mysql_clear_password.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/query_cache_info.so +lib/mysql/plugin/query_response_time.so +lib/mysql/plugin/semisync_master.so +lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/server_audit.so +lib/mysql/plugin/sql_errlog.so +libexec/mysqld +man/man1/aria_chk.1.gz +man/man1/aria_dump_log.1.gz +man/man1/aria_ftdump.1.gz +man/man1/aria_pack.1.gz +man/man1/aria_read_log.1.gz +man/man1/innochecksum.1.gz +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqltest.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +man/man8/mysqld.8.gz +%%DATADIR%%/binary-configure +%%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%%/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%%/install_spider.sql +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/magic +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-innodb-heavy-4G.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql.server +%%DATADIR%%/mysql_performance_tables.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 |