FreeBSD Bugzilla – Attachment 147249 Details for
Bug 193539
[NEW PORT] databases/mariadb100-server, databases/mariadb100-client: MariaDB 10.0 (Client and Server)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
shar containing mariadb100-client and -server ports and Mk/bsd.databases.mk patch
mariadb100.shar (text/plain), 70.83 KB, created by
Bernard Spil
on 2014-09-12 15:03:13 UTC
(
hide
)
Description:
shar containing mariadb100-client and -server ports and Mk/bsd.databases.mk patch
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2014-09-12 15:03:13 UTC
Size:
70.83 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># bsd.databases.mk.patch ># databases/mariadb100-client ># databases/mariadb100-client/files ># databases/mariadb100-client/files/patch-cmake__jemalloc.cmake ># databases/mariadb100-client/files/patch-include_CMakeLists.txt ># databases/mariadb100-client/files/patch-sql_CMakeLists.txt ># databases/mariadb100-client/files/pkg-message.in ># databases/mariadb100-client/files/patch-scripts_mysql_config.sh ># databases/mariadb100-client/files/patch-client_CMakeLists.txt ># databases/mariadb100-client/files/patch-man_CMakeLists.txt ># databases/mariadb100-client/files/patch-mysys_my_default.c ># databases/mariadb100-client/files/patch-libservices_CMakeLists.txt ># databases/mariadb100-client/files/patch-scripts_CMakeLists.txt ># databases/mariadb100-client/files/patch-pcre_CMakeLists.txt ># databases/mariadb100-client/files/patch-include_my_compare.h ># databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp ># databases/mariadb100-client/files/patch-extra_CMakeLists.txt ># databases/mariadb100-client/files/patch-support-files_CMakeLists.txt ># databases/mariadb100-client/files/patch-CMakeLists.txt ># databases/mariadb100-client/pkg-plist ># databases/mariadb100-client/Makefile ># databases/mariadb100-server ># databases/mariadb100-server/distinfo ># databases/mariadb100-server/files ># databases/mariadb100-server/files/extra-patch-include_my_compare.h ># databases/mariadb100-server/files/patch-cmake__jemalloc.cmake ># databases/mariadb100-server/files/patch-include_CMakeLists.txt ># databases/mariadb100-server/files/patch-sql_sql_trigger.cc ># databases/mariadb100-server/files/pkg-message.in ># databases/mariadb100-server/files/patch-client_CMakeLists.txt ># databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh ># databases/mariadb100-server/files/patch-scripts_CMakeLists.txt ># databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp ># databases/mariadb100-server/files/mysql-server.in ># databases/mariadb100-server/files/patch-sql_CMakeLists.txt ># databases/mariadb100-server/files/patch-extra_CMakeLists.txt ># databases/mariadb100-server/files/patch-libservices_CMakeLists.txt ># databases/mariadb100-server/files/patch-scripts_mysql_config.sh ># databases/mariadb100-server/files/patch-sql_sql_view.cc ># databases/mariadb100-server/files/patch-mysys_my_default.c ># databases/mariadb100-server/files/patch-man_CMakeLists.txt ># databases/mariadb100-server/files/patch-pcre_CMakeLists.txt ># databases/mariadb100-server/files/patch-sql_sys_vars.cc ># databases/mariadb100-server/files/patch-CMakeLists.txt ># databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt ># databases/mariadb100-server/files/patch-support-files_CMakeLists.txt ># databases/mariadb100-server/Makefile ># databases/mariadb100-server/pkg-descr ># databases/mariadb100-server/pkg-plist ># >echo x - bsd.databases.mk.patch >sed 's/^X//' >bsd.databases.mk.patch << '6263a5d6e2be924e651936b33380bcaa' >X--- Mk/bsd.database.mk.orig 2014-09-07 00:55:17.000000000 +0200 >X+++ Mk/bsd.database.mk 2014-09-07 20:48:15.000000000 +0200 >X@@ -129,10 +129,11 @@ >X MYSQL55p_LIBVER= 18 >X MYSQL56_LIBVER= 18 >X MYSQL56p_LIBVER= 18 >X+MYSQL100m_LIBVER= 18 >X >X # Setting/finding MySQL version we want. >X .if exists(${LOCALBASE}/bin/mysql) >X-_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/' >X+_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' >X _PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l >X _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l >X >X@@ -172,6 +173,9 @@ >X .elif (${MYSQL_VER} == "55m") >X _MYSQL_CLIENT= databases/mariadb55-client >X _MYSQL_SERVER= databases/mariadb55-server >X+.elif (${MYSQL_VER} == "100m") >X+_MYSQL_CLIENT= databases/mariadb100-client >X+_MYSQL_SERVER= databases/mariadb100-server >X .elif (${MYSQL_VER} == "55p") >X _MYSQL_CLIENT= databases/percona55-client >X _MYSQL_SERVER= databases/percona55-server >6263a5d6e2be924e651936b33380bcaa >echo c - databases/mariadb100-client >mkdir -p databases/mariadb100-client > /dev/null 2>&1 >echo c - databases/mariadb100-client/files >mkdir -p databases/mariadb100-client/files > /dev/null 2>&1 >echo x - databases/mariadb100-client/files/patch-cmake__jemalloc.cmake >sed 's/^X//' >databases/mariadb100-client/files/patch-cmake__jemalloc.cmake << '7e05bc08c7c75f03ba80e1354837f9d3' >X--- cmake/jemalloc.cmake.orig 2014-08-09 00:13:47.000000000 +0200 >X+++ cmake/jemalloc.cmake 2014-09-05 22:13:05.641456743 +0200 >X@@ -50,9 +50,9 @@ >X >X MACRO (CHECK_JEMALLOC) >X IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes") >X- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) >X+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) >X IF (HAVE_JEMALLOC) >X- SET(LIBJEMALLOC jemalloc) >X+ SET(LIBJEMALLOC c) >X SET(MALLOC_LIBRARY "system jemalloc") >X ELSEIF (WITH_JEMALLOC STREQUAL "system") >X MESSAGE(FATAL_ERROR "system jemalloc is not found") >7e05bc08c7c75f03ba80e1354837f9d3 >echo x - databases/mariadb100-client/files/patch-include_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-include_CMakeLists.txt << '2c59c252bbbd94cc948629b70cb2905a' >X--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 >X+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 >X@@ -58,13 +58,18 @@ >X FOREACH(f ${HEADERS_GEN_CONFIGURE}) >X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) >X ENDFOREACH(f) >X-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") >X+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development >X+ FILES_MATCHING PATTERN "*.h" >X+ PATTERN "psi_abi*" EXCLUDE >X+) >X >X STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") >X STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") >X >X+IF(FALSE) >X INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development >X FILES_MATCHING PATTERN "*.h" >X PATTERN CMakeFiles EXCLUDE >X PATTERN mysql EXCLUDE >X REGEX "\\./(${EXCL_RE}$)" EXCLUDE) >X+ENDIF() >2c59c252bbbd94cc948629b70cb2905a >echo x - databases/mariadb100-client/files/patch-sql_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-sql_CMakeLists.txt << 'a496efaa4dcb3dcd3ee43635d16fb221' >X--- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200 >X+++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200 >X@@ -226,9 +226,9 @@ >X ) >X >X # Gen_lex_hash >X-IF(NOT CMAKE_CROSSCOMPILING) >X+ >X ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) >X-ENDIF() >X+ >X >X ADD_CUSTOM_COMMAND( >X OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h >a496efaa4dcb3dcd3ee43635d16fb221 >echo x - databases/mariadb100-client/files/pkg-message.in >sed 's/^X//' >databases/mariadb100-client/files/pkg-message.in << '7958feace13d1e22275211bae8dcaa2f' >X************************************************************************ >X >XMariaDB respects hier(7) and doesn't check /etc and /etc/mysql for >Xmy.cnf. Please move existing my.cnf files from those paths to >X%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. >X >X************************************************************************ >7958feace13d1e22275211bae8dcaa2f >echo x - databases/mariadb100-client/files/patch-scripts_mysql_config.sh >sed 's/^X//' >databases/mariadb100-client/files/patch-scripts_mysql_config.sh << 'b20fdf4e0207a2033a078d7abf75d67f' >X--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 >X+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 >X@@ -108,8 +108,11 @@ >X # We intentionally add a space to the beginning and end of lib strings, simplifies replace later >X libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" >X libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " >X+libs="$libs -L%%LOCALBASE%%/lib " >X libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " >X+libs_r="$libs_r -L%%LOCALBASE%%/lib " >X embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " >X+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " >X >X if [ -r "$pkglibdir/libmygcc.a" ]; then >X # When linking against the static library with a different version of GCC >b20fdf4e0207a2033a078d7abf75d67f >echo x - databases/mariadb100-client/files/patch-client_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-client_CMakeLists.txt << '71ed25250971fff579dc86aad26b9d32' >X--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 >X+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 >X@@ -38,11 +38,12 @@ >X SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) >X ENDIF(UNIX) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) >X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") >X TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) >X SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) >X- >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) >X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) >X@@ -53,21 +54,25 @@ >X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) >X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) >X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) >X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) >X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) >X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) >X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) >X >X MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) >X-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) >X+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) >X >X MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) >X SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") >X@@ -79,10 +84,12 @@ >X ENDIF(WIN32) >X >X # async_example is just a code example, do not install it. >X+IF(FALSE) >X ADD_EXECUTABLE(async_example async_example.c) >X TARGET_LINK_LIBRARIES(async_example mysqlclient) >X+ENDIF() >X >X-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example >X+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap >X PROPERTIES HAS_CXX TRUE) >X >X ADD_DEFINITIONS(-DHAVE_DLOPEN) >71ed25250971fff579dc86aad26b9d32 >echo x - databases/mariadb100-client/files/patch-man_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-man_CMakeLists.txt << '7773076f1e5463ec3f21051acf1a065e' >X--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 >X+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 >X@@ -30,9 +30,13 @@ >X SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 >X mysqltest_embedded.1 mysql_client_test_embedded.1) >X >X+IF(FALSE) >X INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) >X INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) >X+ENDIF() >X INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) >X INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) >X+IF(FALSE) >X INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) >X+ENDIF() >X >7773076f1e5463ec3f21051acf1a065e >echo x - databases/mariadb100-client/files/patch-mysys_my_default.c >sed 's/^X//' >databases/mariadb100-client/files/patch-mysys_my_default.c << 'b922c431ba77d0c4f171aa1c049f5793' >X--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 >X+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 >X@@ -90,7 +90,7 @@ >X >X /* Which directories are searched for options (and in which order) */ >X >X-#define MAX_DEFAULT_DIRS 6 >X+#define MAX_DEFAULT_DIRS 7 >X #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ >X static const char **default_directories = NULL; >X >X@@ -785,7 +785,7 @@ >X { >X MY_STAT stat_info; >X if (!my_stat(name,&stat_info,MYF(0))) >X- return 1; >X+ return 0; >X /* >X Ignore world-writable regular files. >X This is mainly done to protect us to not read a file created by >X@@ -803,6 +803,14 @@ >X if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) >X return 1; /* Ignore wrong files */ >X >X+ if (strstr(name, "/etc") == name) >X+ { >X+ fprintf(stderr, >X+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", >X+ name,name); >X+ goto err; >X+ } >X+ >X while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) >X { >X line++; >X@@ -1067,7 +1075,8 @@ >X if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ >X *end++= '.'; >X strxmov(end, conf_file, *ext, " ", NullS); >X- fputs(name, stdout); >X+ if (strstr(name, "/etc") != name) >X+ fputs(name, stdout); >X } >X } >X } >X@@ -1223,13 +1232,10 @@ >X >X #else >X >X-#if defined(DEFAULT_SYSCONFDIR) >X- if (DEFAULT_SYSCONFDIR[0]) >X- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); >X-#else >X errors += add_directory(alloc, "/etc/", dirs); >X errors += add_directory(alloc, "/etc/mysql/", dirs); >X-#endif /* DEFAULT_SYSCONFDIR */ >X+ errors += add_directory(alloc, "/usr/local/etc/", dirs); >X+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); >X >X #endif >X >b922c431ba77d0c4f171aa1c049f5793 >echo x - databases/mariadb100-client/files/patch-libservices_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-libservices_CMakeLists.txt << '8f6e42df307e11f3a337e07137647b5e' >X--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 >X+++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200 >X@@ -29,4 +29,6 @@ >X logger_service.c) >X >X ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) >X+IF(FALSE) >X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) >X+ENDIF() >8f6e42df307e11f3a337e07137647b5e >echo x - databases/mariadb100-client/files/patch-scripts_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-scripts_CMakeLists.txt << '6dad708dc7e2d9989b0a474fde943196' >X--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 >X@@ -72,6 +72,7 @@ >X ) >X ENDIF() >X >X+IF(FALSE) >X INSTALL(FILES >X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql >X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql >X@@ -81,6 +82,7 @@ >X ${FIX_PRIVILEGES_SQL} >X DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server >X ) >X+ENDIF() >X >X # TCMalloc hacks >X IF(MALLOC_LIB) >X@@ -140,6 +142,7 @@ >X SET(HOSTNAME "hostname") >X SET(MYSQLD_USER "mysql") >X >X+IF(FALSE) >X # Required for mysqlbug until autotools are deprecated, once done remove these >X # and expand default cmake variables >X SET(CC ${CMAKE_C_COMPILER}) >X@@ -180,6 +183,7 @@ >X DESTINATION ${INSTALL_BINDIR} >X COMPONENT Server >X ) >X+ENDIF() >X >X ENDIF(UNIX) >X >X@@ -204,6 +208,7 @@ >X SET(localstatedir ${MYSQL_DATADIR}) >X ENDIF() >X >X+IF() >X IF(UNIX) >X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh >X ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) >X@@ -219,6 +224,7 @@ >X COMPONENT Server >X ) >X ENDIF() >X+ENDIF() >X >X SET(prefix "${CMAKE_INSTALL_PREFIX}") >X IF(INSTALL_SYSCONFDIR) >X@@ -281,6 +287,8 @@ >X STRING(REGEX REPLACE "^lib" "" lib "${lib}") >X SET(${var} "${${var}}-l${lib} " ) >X ENDIF() >X+ ELSEIF(lib STREQUAL "-pthread") >X+ SET(${var} "${${var}}-pthread " ) >X ELSE() >X SET(${var} "${${var}}-l${lib} " ) >X ENDIF() >X@@ -339,18 +347,8 @@ >X SET(BIN_SCRIPTS >X msql2mysql >X mysql_config >X- mysql_fix_extensions >X- mysql_setpermission >X- mysql_secure_installation >X- mysql_zap >X mysqlaccess >X- mysql_convert_table_format >X mysql_find_rows >X- mytop >X- mysqlhotcopy >X- mysqldumpslow >X- mysqld_multi >X- mysqld_safe >X ) >X FOREACH(file ${BIN_SCRIPTS}) >X IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) >6dad708dc7e2d9989b0a474fde943196 >echo x - databases/mariadb100-client/files/patch-pcre_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-pcre_CMakeLists.txt << 'b9e3c0bbed4490f071a2f3172472d90f' >X--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 >X+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 >X@@ -513,6 +513,8 @@ >X MESSAGE(STATUS "") >X ENDIF(PCRE_SHOW_REPORT) >X >X+IF(FALSE) >X INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) >X+ENDIF() >X >X # end CMakeLists.txt >b9e3c0bbed4490f071a2f3172472d90f >echo x - databases/mariadb100-client/files/patch-include_my_compare.h >sed 's/^X//' >databases/mariadb100-client/files/patch-include_my_compare.h << '949db937eb510e62318c984211f17972' >X--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200 >X+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200 >X@@ -40,7 +40,7 @@ >X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. >X */ >X >X-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ >X+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ >X #define HA_MAX_KEY_SEG 32 /* Max segments for key */ >X >X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) >949db937eb510e62318c984211f17972 >echo x - databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp >sed 's/^X//' >databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp << '5ead0028eda5fb8f34ee679f203ea837' >X--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 >X+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 >X@@ -75,7 +75,7 @@ >X CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( >X size_type n, const void *) >X { >X- if (n > this->max_size()) >X+ if (n > AlignedAllocator<T>::max_size()) >X return 0; >X if (n == 0) >X return 0; >5ead0028eda5fb8f34ee679f203ea837 >echo x - databases/mariadb100-client/files/patch-extra_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-extra_CMakeLists.txt << '33708d0c076308705ac088150698bc1e' >X--- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200 >X+++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200 >X@@ -54,6 +54,7 @@ >X DEPENDS >X ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) >X TARGET_LINK_LIBRARIES(my_print_defaults mysys) >X >X@@ -74,11 +75,14 @@ >X >X MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) >X TARGET_LINK_LIBRARIES(replace mysys) >X+ENDIF() >X IF(UNIX) >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) >X >X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) >X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) >X TARGET_LINK_LIBRARIES(mysql_waitpid mysys) >33708d0c076308705ac088150698bc1e >echo x - databases/mariadb100-client/files/patch-support-files_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-support-files_CMakeLists.txt << 'd2d7442579233067b0e341200801f1cc' >X--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 >X+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 >X@@ -41,15 +41,18 @@ >X SET(inst_location ${INSTALL_SUPPORTFILESDIR}) >X ENDIF() >X >X+IF(FALSE) >X FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) >X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh >X ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) >X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} >X DESTINATION ${inst_location} COMPONENT IniFiles) >X ENDFOREACH() >X+ENDIF() >X >X IF(UNIX) >X SET(prefix ${CMAKE_INSTALL_PREFIX}) >X+ IF(FALSE) >X FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) >X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh >X ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) >X@@ -67,8 +70,10 @@ >X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) >X INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) >X ENDIF() >X+ ENDIF() >X >X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) >X+ IF(FALSE) >X CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) >X CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) >X >X@@ -92,6 +97,7 @@ >X DESTINATION ${inst_location} COMPONENT SupportFiles >X PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ >X GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) >X+ >X >X IF (INSTALL_SYSCONFDIR) >X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d >X@@ -101,6 +107,7 @@ >X RENAME mysql COMPONENT SupportFiles >X PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ >X GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) >X+ ENDIF() >X >X INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} >X COMPONENT Common) >d2d7442579233067b0e341200801f1cc >echo x - databases/mariadb100-client/files/patch-CMakeLists.txt >sed 's/^X//' >databases/mariadb100-client/files/patch-CMakeLists.txt << 'd04ef78e2792d5cf4807927ab52ca060' >X--- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ CMakeLists.txt 2014-09-07 14:03:01.000000000 +0200 >X@@ -430,28 +430,8 @@ >X ADD_SUBDIRECTORY(extra) >X ADD_SUBDIRECTORY(libservices) >X ADD_SUBDIRECTORY(scripts) >X-ADD_SUBDIRECTORY(sql/share) >X ADD_SUBDIRECTORY(support-files) >X >X-IF(NOT WITHOUT_SERVER) >X- ADD_SUBDIRECTORY(tests) >X- ADD_SUBDIRECTORY(sql) >X- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) >X- IF(WITH_EMBEDDED_SERVER) >X- ADD_SUBDIRECTORY(libmysqld) >X- ADD_SUBDIRECTORY(libmysqld/examples) >X- ENDIF(WITH_EMBEDDED_SERVER) >X- >X- ADD_SUBDIRECTORY(mysql-test) >X- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) >X- ADD_SUBDIRECTORY(sql-bench) >X- >X- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) >X- ADD_SUBDIRECTORY(internal) >X- ENDIF() >X- ADD_SUBDIRECTORY(packaging/rpm-oel) >X-ENDIF() >X- >X IF(UNIX) >X ADD_SUBDIRECTORY(man) >X ENDIF() >X@@ -463,10 +443,9 @@ >X ADD_SUBDIRECTORY(win/upgrade_wizard) >X ADD_SUBDIRECTORY(win/packaging) >X ENDIF() >X-ADD_SUBDIRECTORY(packaging/solaris) >X >X IF(NOT CMAKE_CROSSCOMPILING) >X- SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) >X+ SET(EXPORTED comp_err comp_sql factorial) >X # minimal target to build only binaries for export >X ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) >X EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake) >X@@ -503,6 +482,7 @@ >X WORKING_DIRECTORY ${CMAKE_BINARY_DIR} >X ) >X >X+IF(FALSE) >X INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT >X COMPONENT Readme) >X INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC >X@@ -511,6 +491,7 @@ >X IF(UNIX) >X INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) >X ENDIF() >X+ENDIF() >X >X INCLUDE(CPack) >X >d04ef78e2792d5cf4807927ab52ca060 >echo x - databases/mariadb100-client/pkg-plist >sed 's/^X//' >databases/mariadb100-client/pkg-plist << 'bb08c91949eb68415b0ade0ea6774613' >Xbin/msql2mysql >Xbin/mysql >Xbin/mysql_config >Xbin/mysql_find_rows >Xbin/mysql_waitpid >Xbin/mysqlaccess >Xbin/mysqladmin >Xbin/mysqlbinlog >Xbin/mysqlcheck >Xbin/mysqldump >Xbin/mysqlimport >Xbin/mysqlshow >Xbin/mysqlslap >Xinclude/mysql/auth_dialog_client.h >Xinclude/mysql/big_endian.h >Xinclude/mysql/byte_order_generic.h >Xinclude/mysql/byte_order_generic_x86.h >Xinclude/mysql/byte_order_generic_x86_64.h >Xinclude/mysql/client_plugin.h >Xinclude/mysql/decimal.h >Xinclude/mysql/errmsg.h >Xinclude/mysql/handler_ername.h >Xinclude/mysql/handler_state.h >Xinclude/mysql/keycache.h >Xinclude/mysql/little_endian.h >Xinclude/mysql/m_ctype.h >Xinclude/mysql/m_string.h >Xinclude/mysql/ma_dyncol.h >Xinclude/mysql/my_alloc.h >Xinclude/mysql/my_attribute.h >Xinclude/mysql/my_byteorder.h >Xinclude/mysql/my_compiler.h >Xinclude/mysql/my_config.h >Xinclude/mysql/my_dbug.h >Xinclude/mysql/my_decimal_limits.h >Xinclude/mysql/my_dir.h >Xinclude/mysql/my_getopt.h >Xinclude/mysql/my_global.h >Xinclude/mysql/my_list.h >Xinclude/mysql/my_net.h >Xinclude/mysql/my_pthread.h >Xinclude/mysql/my_sys.h >Xinclude/mysql/my_valgrind.h >Xinclude/mysql/my_xml.h >Xinclude/mysql/mysql.h >Xinclude/mysql/mysql_com.h >Xinclude/mysql/mysql_com_server.h >Xinclude/mysql/mysql_embed.h >Xinclude/mysql/mysql_time.h >Xinclude/mysql/mysql_version.h >Xinclude/mysql/mysqld_ername.h >Xinclude/mysql/mysqld_error.h >Xinclude/mysql/plugin.h >Xinclude/mysql/plugin_audit.h >Xinclude/mysql/plugin_auth.h >Xinclude/mysql/plugin_auth_common.h >Xinclude/mysql/plugin_ftparser.h >Xinclude/mysql/psi/mysql_file.h >Xinclude/mysql/psi/mysql_idle.h >Xinclude/mysql/psi/mysql_socket.h >Xinclude/mysql/psi/mysql_stage.h >Xinclude/mysql/psi/mysql_statement.h >Xinclude/mysql/psi/mysql_table.h >Xinclude/mysql/psi/mysql_thread.h >Xinclude/mysql/psi/psi.h >Xinclude/mysql/service_debug_sync.h >Xinclude/mysql/service_kill_statement.h >Xinclude/mysql/service_logger.h >Xinclude/mysql/service_my_plugin_log.h >Xinclude/mysql/service_my_snprintf.h >Xinclude/mysql/service_progress_report.h >Xinclude/mysql/service_sha1.h >Xinclude/mysql/service_thd_alloc.h >Xinclude/mysql/service_thd_autoinc.h >Xinclude/mysql/service_thd_error_context.h >Xinclude/mysql/service_thd_timezone.h >Xinclude/mysql/service_thd_wait.h >Xinclude/mysql/services.h >Xinclude/mysql/sql_common.h >Xinclude/mysql/sql_state.h >Xinclude/mysql/sslopt-case.h >Xinclude/mysql/sslopt-longopts.h >Xinclude/mysql/sslopt-vars.h >Xinclude/mysql/typelib.h >Xlib/mysql/libmysqlclient.a >Xlib/mysql/libmysqlclient.so >Xlib/mysql/libmysqlclient.so.18 >Xlib/mysql/libmysqlclient_r.a >Xlib/mysql/libmysqlclient_r.so >Xlib/mysql/libmysqlclient_r.so.18 >Xman/man1/msql2mysql.1.gz >Xman/man1/mysql.1.gz >Xman/man1/mysql_config.1.gz >Xman/man1/mysql_find_rows.1.gz >Xman/man1/mysql_plugin.1.gz >Xman/man1/mysql_waitpid.1.gz >Xman/man1/mysqlaccess.1.gz >Xman/man1/mysqladmin.1.gz >Xman/man1/mysqlbinlog.1.gz >Xman/man1/mysqlcheck.1.gz >Xman/man1/mysqldump.1.gz >Xman/man1/mysqlimport.1.gz >Xman/man1/mysqlshow.1.gz >Xman/man1/mysqlslap.1.gz >X@dirrm include/mysql/psi >X@dirrm include/mysql >X@dirrmtry lib/mysql >bb08c91949eb68415b0ade0ea6774613 >echo x - databases/mariadb100-client/Makefile >sed 's/^X//' >databases/mariadb100-client/Makefile << 'acde4fac109ca2aed8e2b6985309dc1e' >X# $FreeBSD: head/databases/mariadb55-client/Makefile 357838 2014-06-15 08:26:47Z miwi $ >X >XPORTNAME= mariadb >XPKGNAMESUFFIX= 100-client >X >XCOMMENT= Multithreaded SQL database (client) >X >XMASTERDIR= ${.CURDIR}/../mariadb100-server >X >XFILESDIR= ${.CURDIR}/files >XPATCHDIR= ${.CURDIR}/files >XPLIST= ${.CURDIR}/pkg-plist >X >XCONFLICTS_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-* >X >XCMAKE_ARGS+= -DWITHOUT_SERVER=1 >X >XUSE_LDCONFIG= ${PREFIX}/lib/mysql >X >XCLIENT_ONLY= yes >X >X.include "${MASTERDIR}/Makefile" >acde4fac109ca2aed8e2b6985309dc1e >echo c - databases/mariadb100-server >mkdir -p databases/mariadb100-server > /dev/null 2>&1 >echo x - databases/mariadb100-server/distinfo >sed 's/^X//' >databases/mariadb100-server/distinfo << '63fe8859943c1cd91ef765da758e8e02' >XSHA256 (mariadb-10.0.13.tar.gz) = 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d >XSIZE (mariadb-10.0.13.tar.gz) = 51333762 >63fe8859943c1cd91ef765da758e8e02 >echo c - databases/mariadb100-server/files >mkdir -p databases/mariadb100-server/files > /dev/null 2>&1 >echo x - databases/mariadb100-server/files/extra-patch-include_my_compare.h >sed 's/^X//' >databases/mariadb100-server/files/extra-patch-include_my_compare.h << '9db24a51721052fe6530347b932f8eed' >X--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 >X+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 >X@@ -40,7 +40,7 @@ >X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. >X */ >X >X-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ >X+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ >X #define HA_MAX_KEY_SEG 32 /* Max segments for key */ >X >X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) >9db24a51721052fe6530347b932f8eed >echo x - databases/mariadb100-server/files/patch-cmake__jemalloc.cmake >sed 's/^X//' >databases/mariadb100-server/files/patch-cmake__jemalloc.cmake << 'd52fa550d851e9197934524554184619' >X--- cmake/jemalloc.cmake.orig 2014-08-09 00:13:47.000000000 +0200 >X+++ cmake/jemalloc.cmake 2014-09-05 18:29:09.213386547 +0200 >X@@ -50,9 +50,9 @@ >X >X MACRO (CHECK_JEMALLOC) >X IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes") >X- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) >X+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) >X IF (HAVE_JEMALLOC) >X- SET(LIBJEMALLOC jemalloc) >X+ SET(LIBJEMALLOC c) >X SET(MALLOC_LIBRARY "system jemalloc") >X ELSEIF (WITH_JEMALLOC STREQUAL "system") >X MESSAGE(FATAL_ERROR "system jemalloc is not found") >d52fa550d851e9197934524554184619 >echo x - databases/mariadb100-server/files/patch-include_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-include_CMakeLists.txt << 'a2f22cbf1112ab30bc07189b37440e20' >X--- include/CMakeLists.txt.orig 2014-08-09 00:13:38.000000000 +0200 >X+++ include/CMakeLists.txt 2014-09-05 18:38:18.461346954 +0200 >X@@ -62,17 +62,21 @@ >X handler_ername.h >X ) >X >X+IF(FALSE) >X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) >X FOREACH(f ${HEADERS_GEN_CONFIGURE}) >X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) >X ENDFOREACH(f) >X INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") >X+ENDIF() >X >X STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") >X STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") >X >X+IF(FALSE) >X INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development >X FILES_MATCHING PATTERN "*.h" >X PATTERN CMakeFiles EXCLUDE >X PATTERN mysql EXCLUDE >X REGEX "\\./(${EXCL_RE}$)" EXCLUDE) >X+ENDIF() >a2f22cbf1112ab30bc07189b37440e20 >echo x - databases/mariadb100-server/files/patch-sql_sql_trigger.cc >sed 's/^X//' >databases/mariadb100-server/files/patch-sql_sql_trigger.cc << 'd10a2e6353b48656bdc1cf525154bb47' >X--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000 >X+++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000 >X@@ -192,32 +192,32 @@ >X { >X { >X { C_STRING_WITH_LEN("triggers") }, >X- my_offsetof(class Table_triggers_list, definitions_list), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), >X FILE_OPTIONS_STRLIST >X }, >X { >X { C_STRING_WITH_LEN("sql_modes") }, >X- my_offsetof(class Table_triggers_list, definition_modes_list), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), >X FILE_OPTIONS_ULLLIST >X }, >X { >X { C_STRING_WITH_LEN("definers") }, >X- my_offsetof(class Table_triggers_list, definers_list), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), >X FILE_OPTIONS_STRLIST >X }, >X { >X { C_STRING_WITH_LEN("client_cs_names") }, >X- my_offsetof(class Table_triggers_list, client_cs_names), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), >X FILE_OPTIONS_STRLIST >X }, >X { >X { C_STRING_WITH_LEN("connection_cl_names") }, >X- my_offsetof(class Table_triggers_list, connection_cl_names), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), >X FILE_OPTIONS_STRLIST >X }, >X { >X { C_STRING_WITH_LEN("db_cl_names") }, >X- my_offsetof(class Table_triggers_list, db_cl_names), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), >X FILE_OPTIONS_STRLIST >X }, >X { { 0, 0 }, 0, FILE_OPTIONS_STRING } >X@@ -226,7 +226,7 @@ >X File_option sql_modes_parameters= >X { >X { C_STRING_WITH_LEN("sql_modes") }, >X- my_offsetof(class Table_triggers_list, definition_modes_list), >X+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), >X FILE_OPTIONS_ULLLIST >X }; >X >d10a2e6353b48656bdc1cf525154bb47 >echo x - databases/mariadb100-server/files/pkg-message.in >sed 's/^X//' >databases/mariadb100-server/files/pkg-message.in << 'b81b09eaa9e7ed956e46723deb3233c4' >X************************************************************************ >X >XRemember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) >Xthe first time you start the MySQL server after an upgrade from an >Xearlier version. >X >XMariaDB respects hier(7) and doesn't check /etc and /etc/mysql for >Xmy.cnf. Please move existing my.cnf files from those paths to >X%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. >X >X************************************************************************ >b81b09eaa9e7ed956e46723deb3233c4 >echo x - databases/mariadb100-server/files/patch-client_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-client_CMakeLists.txt << '49a66258e645bf463135d4fd84c14c9b' >X--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 >X+++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 >X@@ -30,6 +30,7 @@ >X COPY_OPENSSL_DLLS(copy_openssl_client) >X >X ADD_DEFINITIONS(${SSL_DEFINES}) >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc >X ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) >X TARGET_LINK_LIBRARIES(mysql mysqlclient) >X@@ -37,6 +38,7 @@ >X TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) >X SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) >X ENDIF(UNIX) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) >X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") >X@@ -44,6 +46,7 @@ >X SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) >X >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) >X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) >X >X@@ -52,17 +55,21 @@ >X >X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) >X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) >X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) >X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) >X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) >X+ENDIF() >X >X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) >X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) >X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) >X >X@@ -72,17 +79,20 @@ >X MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) >X SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") >X TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) >X+ENDIF() >X >X # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". >X IF(WIN32) >X MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) >X ENDIF(WIN32) >X >X+IF(FALSE) >X # async_example is just a code example, do not install it. >X ADD_EXECUTABLE(async_example async_example.c) >X TARGET_LINK_LIBRARIES(async_example mysqlclient) >X+ENDIF() >X >X-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example >X+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin >X PROPERTIES HAS_CXX TRUE) >X >X ADD_DEFINITIONS(-DHAVE_DLOPEN) >49a66258e645bf463135d4fd84c14c9b >echo x - databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh >sed 's/^X//' >databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh << '065dffe1bd1f78abba90cbc5b90ebf5c' >X--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 >X+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 >X@@ -235,10 +235,10 @@ >X >X if test -z "$MYSQL_HOME" >X then >X- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" >X+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" >X then >X log_error "WARNING: Found two instances of my.cnf - >X-$MY_BASEDIR_VERSION/my.cnf and >X+$MY_BASEDIR_VERSION/etc/my.cnf and >X $DATADIR/my.cnf >X IGNORING $DATADIR/my.cnf" >X >X@@ -247,7 +247,7 @@ >X then >X log_error "WARNING: Found $DATADIR/my.cnf >X The data directory is a deprecated location for my.cnf, please move it to >X-$MY_BASEDIR_VERSION/my.cnf" >X+$MY_BASEDIR_VERSION/etc/my.cnf" >X MYSQL_HOME=$DATADIR >X else >X MYSQL_HOME=$MY_BASEDIR_VERSION >065dffe1bd1f78abba90cbc5b90ebf5c >echo x - databases/mariadb100-server/files/patch-scripts_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-scripts_CMakeLists.txt << '1a14c42b4fddecd1414cae027a2b4ccb' >X--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ scripts/CMakeLists.txt 2014-09-05 19:06:46.206250221 +0200 >X@@ -281,6 +281,8 @@ >X STRING(REGEX REPLACE "^lib" "" lib "${lib}") >X SET(${var} "${${var}}-l${lib} " ) >X ENDIF() >X+ ELSEIF(lib STREQUAL "-pthread") >X+ SET(${var} "${${var}}-pthread " ) >X ELSE() >X SET(${var} "${${var}}-l${lib} " ) >X ENDIF() >1a14c42b4fddecd1414cae027a2b4ccb >echo x - databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp >sed 's/^X//' >databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp << '300e327332ade7a86bed6442441c5a99' >X--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 >X+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 >X@@ -75,7 +75,7 @@ >X CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( >X size_type n, const void *) >X { >X- if (n > this->max_size()) >X+ if (n > AlignedAllocator<T>::max_size()) >X return 0; >X if (n == 0) >X return 0; >300e327332ade7a86bed6442441c5a99 >echo x - databases/mariadb100-server/files/mysql-server.in >sed 's/^X//' >databases/mariadb100-server/files/mysql-server.in << 'a847bd5ffd77fa8edbe3b14d11cbfdf1' >X#!/bin/sh >X >X# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ >X# >X# PROVIDE: mysql >X# REQUIRE: LOGIN >X# KEYWORD: shutdown >X# >X# Add the following line to /etc/rc.conf to enable mysql: >X# mysql_(instance_)?enable (bool): Set to "NO" by default. >X# Set it to "YES" to enable MySQL. >X# mysql_(instance_)?limits (bool): Set to "NO" by default. >X# Set it to yes to run `limits -e -U mysql` >X# just before mysql starts. >X# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" >X# Base database directory. >X# mysql_(instance_)?args (str): Custom additional arguments to be passed >X# to mysqld_safe (default empty). >X# mysql_(instance_)?pidfile (str): Custum PID file path and name. >X# Default to "${mysql_dbdir}/${hostname}.pid". >X# mysql_(instance_)?user (str): User to run mysqld as >X# Default to "mysql" created by the port >X# mysql_(instance_)?optfile (str): Server-specific option file. >X# Default to "${mysql_dbdir}/my.cnf". >X# mysql_instances (str): Set to "" by default. >X# If defined, list of instances to enable >X >X. /etc/rc.subr >X >Xname="mysql" >Xrcvar=mysql_enable >X >Xload_rc_config $name >X >X: ${mysql_enable="NO"} >X: ${mysql_limits="NO"} >X: ${mysql_user="mysql"} >X: ${mysql_limits_args="-e -U $mysql_user"} >X: ${mysql_dbdir="/var/db/mysql"} >X: ${mysql_optfile="${mysql_dbdir}/my.cnf"} >X >Xcommand="/usr/sbin/daemon" >Xprocname="%%PREFIX%%/libexec/mysqld" >Xstart_precmd="${name}_prestart" >Xstart_postcmd="${name}_poststart" >X >Xif [ -n "$2" ]; then >X instance="$2" >X load_rc_config ${name}_${instance} >X case "$mysql_instances" in >X "$2 "*|*" $2 "*|*" $2"|"$2") >X eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" >X eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" >X eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" >X eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" >X eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" >X eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" >X eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" >X ;; >X *) >X err 1 "$2 not found in mysql_instances" ;; >X esac >Xelse >X if [ -n "${mysql_instances}" -a -n "$1" ]; then >X for instance in ${mysql_instances}; do >X eval _enable="\${mysql_${instance}_enable}" >X case "${_enable:-${mysql_enable}}" in >X [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) >X continue >X ;; >X [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) >X ;; >X *) >X if [ -z "$_enable" ]; then >X _var=mysql_enable >X else >X _var=mysql_${instance}_enable >X fi >X warn "Bad value" \ >X "'${_enable:-${mysql_enable}}'" \ >X "for ${_var}. " \ >X "Instance ${instance} skipped." >X continue >X ;; >X esac >X echo "===> mysql instance: ${instance}" >X if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then >X success="${instance} ${success}" >X else >X failed="${instance} (${retcode}) ${failed}" >X fi >X done >X exit 0 >X else >X mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} >X fi >Xfi >X >Xpidfile=$mysql_pidfile >Xmysql_install_db="%%PREFIX%%/bin/mysql_install_db" >Xmysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" >Xcommand_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" >X >Xmysql_create_auth_tables() >X{ >X eval $mysql_install_db $mysql_install_db_args >X [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} >X} >X >Xmysql_prestart() >X{ >X local dir >X for dir in /etc /etc/mysql; do >X if [ -f "${dir}/my.cnf" ]; then >X echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" >X return 1 >X fi >X done >X if [ ! -d "${mysql_dbdir}/mysql/." ]; then >X mysql_create_auth_tables || return 1 >X fi >X if checkyesno mysql_limits; then >X eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null >X else >X return 0 >X fi >X} >X >Xmysql_poststart() >X{ >X local timeout=15 >X while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do >X timeout=$(( timeout - 1 )) >X sleep 1 >X done >X return 0 >X} >X >Xrun_rc_command "$1" >a847bd5ffd77fa8edbe3b14d11cbfdf1 >echo x - databases/mariadb100-server/files/patch-sql_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-sql_CMakeLists.txt << 'a570d0964bb5c4f33ae09136dfdf1468' >X--- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 >X+++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 >X@@ -278,6 +278,7 @@ >X VERBATIM >X ) >X >X+IF(FALSE) >X IF(INSTALL_LAYOUT STREQUAL "STANDALONE") >X >X # Copy db.opt into data/test/ >X@@ -321,6 +322,7 @@ >X INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) >X ENDIF(WIN32 AND MYSQLD_EXECUTABLE) >X ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") >X+ENDIF() >X >X IF(WIN32) >X SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) >X@@ -363,8 +365,10 @@ >X TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) >X ENDIF(WIN32) >X >X+IF(FALSE) >X INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development >X FILES_MATCHING PATTERN "*.h" >X PATTERN examples EXCLUDE >X PATTERN share EXCLUDE >X PATTERN CMakeFiles EXCLUDE) >X+ENDIF() >a570d0964bb5c4f33ae09136dfdf1468 >echo x - databases/mariadb100-server/files/patch-extra_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-extra_CMakeLists.txt << '7eb38843f2ceabe930c8b403da65da63' >X--- extra/CMakeLists.txt.orig 2014-08-09 00:13:40.000000000 +0200 >X+++ extra/CMakeLists.txt 2014-09-05 18:32:20.555373233 +0200 >X@@ -80,6 +80,8 @@ >X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) >X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) >X >X+IF(FALSE) >X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) >X TARGET_LINK_LIBRARIES(mysql_waitpid mysys) >X ENDIF() >X+ENDIF() >7eb38843f2ceabe930c8b403da65da63 >echo x - databases/mariadb100-server/files/patch-libservices_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-libservices_CMakeLists.txt << 'a1e2a0aaa5cc9d014acbd8f8c4701bae' >X--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 >X+++ libservices/CMakeLists.txt 2014-09-05 18:48:40.074297131 +0200 >X@@ -29,4 +29,6 @@ >X logger_service.c) >X >X ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) >X+IF(FALSE) >X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) >X+ENDIF() >a1e2a0aaa5cc9d014acbd8f8c4701bae >echo x - databases/mariadb100-server/files/patch-scripts_mysql_config.sh >sed 's/^X//' >databases/mariadb100-server/files/patch-scripts_mysql_config.sh << '19ce50da9b68e30d89805f9233e41cd9' >X--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 >X+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 >X@@ -108,8 +108,11 @@ >X # We intentionally add a space to the beginning and end of lib strings, simplifies replace later >X libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" >X libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " >X+libs="$libs -L%%LOCALBASE%%/lib " >X libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " >X+libs_r="$libs_r -L%%LOCALBASE%%/lib " >X embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " >X+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " >X >X if [ -r "$pkglibdir/libmygcc.a" ]; then >X # When linking against the static library with a different version of GCC >19ce50da9b68e30d89805f9233e41cd9 >echo x - databases/mariadb100-server/files/patch-sql_sql_view.cc >sed 's/^X//' >databases/mariadb100-server/files/patch-sql_sql_view.cc << '66692699185cfc024213a6808e8e5c39' >X--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 >X+++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 >X@@ -742,46 +742,46 @@ >X */ >X static File_option view_parameters[]= >X {{{ C_STRING_WITH_LEN("query")}, >X- my_offsetof(TABLE_LIST, select_stmt), >X+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), >X FILE_OPTIONS_ESTRING}, >X {{ C_STRING_WITH_LEN("md5")}, >X- my_offsetof(TABLE_LIST, md5), >X+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), >X FILE_OPTIONS_STRING}, >X {{ C_STRING_WITH_LEN("updatable")}, >X- my_offsetof(TABLE_LIST, updatable_view), >X+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), >X FILE_OPTIONS_ULONGLONG}, >X {{ C_STRING_WITH_LEN("algorithm")}, >X- my_offsetof(TABLE_LIST, algorithm), >X+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), >X FILE_OPTIONS_VIEW_ALGO}, >X {{ C_STRING_WITH_LEN("definer_user")}, >X- my_offsetof(TABLE_LIST, definer.user), >X+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), >X FILE_OPTIONS_STRING}, >X {{ C_STRING_WITH_LEN("definer_host")}, >X- my_offsetof(TABLE_LIST, definer.host), >X+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), >X FILE_OPTIONS_STRING}, >X {{ C_STRING_WITH_LEN("suid")}, >X- my_offsetof(TABLE_LIST, view_suid), >X+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), >X FILE_OPTIONS_ULONGLONG}, >X {{ C_STRING_WITH_LEN("with_check_option")}, >X- my_offsetof(TABLE_LIST, with_check), >X+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), >X FILE_OPTIONS_ULONGLONG}, >X {{ C_STRING_WITH_LEN("timestamp")}, >X- my_offsetof(TABLE_LIST, timestamp), >X+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), >X FILE_OPTIONS_TIMESTAMP}, >X {{ C_STRING_WITH_LEN("create-version")}, >X- my_offsetof(TABLE_LIST, file_version), >X+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), >X FILE_OPTIONS_ULONGLONG}, >X {{ C_STRING_WITH_LEN("source")}, >X- my_offsetof(TABLE_LIST, source), >X+ static_cast<int>(my_offsetof(TABLE_LIST, source)), >X FILE_OPTIONS_ESTRING}, >X {{(char*) STRING_WITH_LEN("client_cs_name")}, >X- my_offsetof(TABLE_LIST, view_client_cs_name), >X+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), >X FILE_OPTIONS_STRING}, >X {{(char*) STRING_WITH_LEN("connection_cl_name")}, >X- my_offsetof(TABLE_LIST, view_connection_cl_name), >X+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), >X FILE_OPTIONS_STRING}, >X {{(char*) STRING_WITH_LEN("view_body_utf8")}, >X- my_offsetof(TABLE_LIST, view_body_utf8), >X+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), >X FILE_OPTIONS_ESTRING}, >X {{NullS, 0}, 0, >X FILE_OPTIONS_STRING} >66692699185cfc024213a6808e8e5c39 >echo x - databases/mariadb100-server/files/patch-mysys_my_default.c >sed 's/^X//' >databases/mariadb100-server/files/patch-mysys_my_default.c << '514fdf9dc21ab03bb1c210227328c582' >X--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 >X+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 >X@@ -90,7 +90,7 @@ >X >X /* Which directories are searched for options (and in which order) */ >X >X-#define MAX_DEFAULT_DIRS 6 >X+#define MAX_DEFAULT_DIRS 7 >X #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ >X static const char **default_directories = NULL; >X >X@@ -785,7 +785,7 @@ >X { >X MY_STAT stat_info; >X if (!my_stat(name,&stat_info,MYF(0))) >X- return 1; >X+ return 0; >X /* >X Ignore world-writable regular files. >X This is mainly done to protect us to not read a file created by >X@@ -803,6 +803,14 @@ >X if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) >X return 1; /* Ignore wrong files */ >X >X+ if (strstr(name, "/etc") == name) >X+ { >X+ fprintf(stderr, >X+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", >X+ name,name); >X+ goto err; >X+ } >X+ >X while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) >X { >X line++; >X@@ -1067,7 +1075,8 @@ >X if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ >X *end++= '.'; >X strxmov(end, conf_file, *ext, " ", NullS); >X- fputs(name, stdout); >X+ if (strstr(name, "/etc") != name) >X+ fputs(name, stdout); >X } >X } >X } >X@@ -1223,13 +1232,10 @@ >X >X #else >X >X-#if defined(DEFAULT_SYSCONFDIR) >X- if (DEFAULT_SYSCONFDIR[0]) >X- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); >X-#else >X errors += add_directory(alloc, "/etc/", dirs); >X errors += add_directory(alloc, "/etc/mysql/", dirs); >X-#endif /* DEFAULT_SYSCONFDIR */ >X+ errors += add_directory(alloc, "/usr/local/etc/", dirs); >X+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); >X >X #endif >X >514fdf9dc21ab03bb1c210227328c582 >echo x - databases/mariadb100-server/files/patch-man_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-man_CMakeLists.txt << '592a37b54b178d77a554ddbb66ab5a20' >X--- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300 >X+++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300 >X@@ -33,7 +33,8 @@ >X >X INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) >X INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) >X+IF(FALSE) >X INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) >X INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) >X INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) >X- >X+ENDIF() >592a37b54b178d77a554ddbb66ab5a20 >echo x - databases/mariadb100-server/files/patch-pcre_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-pcre_CMakeLists.txt << '7134aff4ad2eee18c6d08a54bd54d224' >X--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 >X+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 >X@@ -513,6 +513,8 @@ >X MESSAGE(STATUS "") >X ENDIF(PCRE_SHOW_REPORT) >X >X+IF(FALSE) >X INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) >X+ENDIF() >X >X # end CMakeLists.txt >7134aff4ad2eee18c6d08a54bd54d224 >echo x - databases/mariadb100-server/files/patch-sql_sys_vars.cc >sed 's/^X//' >databases/mariadb100-server/files/patch-sql_sys_vars.cc << '3f6c3af236f6b6d45c9fcef0fbcdbd74' >X--- sql/sys_vars.cc.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ sql/sys_vars.cc 2014-09-05 19:30:55.609134039 +0200 >X@@ -1012,7 +1012,7 @@ >X "connection before closing it", >X SESSION_VAR(net_interactive_timeout), >X CMD_LINE(REQUIRED_ARG), >X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); >X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); >X >X static Sys_var_ulonglong Sys_join_buffer_size( >X "join_buffer_size", >X@@ -2044,7 +2044,7 @@ >X "Number of seconds to wait for more data from a connection before " >X "aborting the read", >X SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), >X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), >X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), >X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), >X ON_UPDATE(fix_net_read_timeout)); >X >X@@ -2059,7 +2059,7 @@ >X "Number of seconds to wait for a block to be written to a connection " >X "before aborting the write", >X SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), >X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), >X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), >X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), >X ON_UPDATE(fix_net_write_timeout)); >X >X@@ -3288,7 +3288,7 @@ >X "The number of seconds the server waits for activity on a " >X "connection before closing it", >X SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), >X- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), >X+ VALID_RANGE(1, INT_MAX32/1000), >X DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); >X >X static Sys_var_plugin Sys_default_storage_engine( >3f6c3af236f6b6d45c9fcef0fbcdbd74 >echo x - databases/mariadb100-server/files/patch-CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-CMakeLists.txt << '223f173c9db502df455562366c020598' >X--- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200 >X@@ -463,7 +463,6 @@ >X ADD_SUBDIRECTORY(win/upgrade_wizard) >X ADD_SUBDIRECTORY(win/packaging) >X ENDIF() >X-ADD_SUBDIRECTORY(packaging/solaris) >X >X IF(NOT CMAKE_CROSSCOMPILING) >X SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) >X@@ -503,6 +502,7 @@ >X WORKING_DIRECTORY ${CMAKE_BINARY_DIR} >X ) >X >X+IF(FALSE) >X INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT >X COMPONENT Readme) >X INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC >X@@ -511,6 +511,7 @@ >X IF(UNIX) >X INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) >X ENDIF() >X+ENDIF() >X >X INCLUDE(CPack) >X >223f173c9db502df455562366c020598 >echo x - databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt << 'e5417fe657dafa0d41915596040c70d5' >X--- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 >X+++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 >X@@ -403,7 +403,7 @@ >X >X # Merge several convenience libraries into one big mysqlclient >X # and link them together into shared library. >X-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) >X+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) >X >X # Visual Studio users need debug static library for debug projects >X IF(MSVC) >X@@ -411,6 +411,7 @@ >X INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) >X ENDIF() >X >X+IF(FALSE) >X IF(UNIX) >X MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) >X SET(DOT_VERSION ".${VERSION}") >X@@ -425,11 +426,13 @@ >X ENDMACRO() >X INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) >X ENDIF() >X+ENDIF() >X >X IF(NOT DISABLE_SHARED) >X MERGE_LIBRARIES(libmysql SHARED ${LIBS} >X EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} >X- COMPONENT SharedLibraries) >X+ COMPONENT SharedLibraries NOINSTALL) >X+IF(FALSE) >X IF(UNIX) >X # libtool compatability >X IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) >X@@ -477,3 +480,4 @@ >X ENDFOREACH() >X ENDIF() >X ENDIF() >X+ENDIF() >e5417fe657dafa0d41915596040c70d5 >echo x - databases/mariadb100-server/files/patch-support-files_CMakeLists.txt >sed 's/^X//' >databases/mariadb100-server/files/patch-support-files_CMakeLists.txt << '03f2ba1d2e094327272a76ea45ed93db' >X--- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 >X+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 >X@@ -66,10 +66,11 @@ >X ENDFOREACH() >X IF(INSTALL_SUPPORTFILESDIR) >X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) >X- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) >X ENDIF() >X >X+IF(FALSE) >X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) >X+ENDIF() >X CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) >X CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) >X >03f2ba1d2e094327272a76ea45ed93db >echo x - databases/mariadb100-server/Makefile >sed 's/^X//' >databases/mariadb100-server/Makefile << '34328fea9423bd89b2e5e58ec89f1a09' >X# $FreeBSD: head/databases/mariadb55-server/Makefile 367285 2014-09-04 16:14:25Z robak $ >X >XPORTNAME?= mariadb >XPORTVERSION= 10.0.13 >XCATEGORIES= databases ipv6 >XMASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ >X http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/ >XPKGNAMESUFFIX?= 100-server >X >XMAINTAINER= never@nevermind.kiev.ua >XCOMMENT?= Multithreaded SQL database (server) >X >XSUB_FILES= pkg-message >XPKGMESSAGE= ${WRKDIR}/pkg-message >X >XSLAVEDIRS= databases/mariadb100-client >XUSES= cmake gmake shebangfix bison:build >XSHEBANG_FILES= scripts/*.sh >XNO_OPTIONS_SORT=yes >X >XOPTIONS_DEFINE+= SSL OPENSSL PORTSSL FASTMTX >XOPTIONS_DEFAULT+= SSL >X >XFASTMTX_DESC= Replace mutexes with spinlocks >XOPENSSL_DESC= Use OpenSSL instead of bundled yassl >XPORTSSL_DESC= Use OpenSSL from port (requires OPENSSL to be set) >X >XCMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ >X -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ >X -DINSTALL_INCLUDEDIR="include/mysql" \ >X -DINSTALL_INFODIR="info" \ >X -DINSTALL_LIBDIR="lib/mysql" \ >X -DINSTALL_MANDIR="man" \ >X -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ >X -DINSTALL_MYSQLSHAREDIR="share/mysql" \ >X -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ >X -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ >X -DINSTALL_SBINDIR="libexec" \ >X -DINSTALL_SCRIPTDIR="bin" \ >X -DINSTALL_SHAREDIR="share" \ >X -DINSTALL_SQLBENCHDIR="share/mysql" \ >X -DINSTALL_SUPPORTFILESDIR="share/mysql" \ >X -DWITH_UNIT_TESTS=0 \ >X -DWITH_LIBEDIT=0 \ >X -DWITH_LIBWRAP=1 \ >X -DEXECINFO_ROOT=${LOCALBASE} \ >X -DCOMPILATION_COMMENT="FreeBSD Ports" >X >X.ifdef USE_MYSQL >X.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. >X.endif >X >XDATADIR= ${PREFIX}/share/mysql >X >X# MySQL-Server options >X.if !defined(CLIENT_ONLY) >XUSE_MYSQL= yes >XOPTIONS_DEFINE+= OQGRAPH MAXKEY >X >XOQGRAPH_DESC= Open Query Graph Computation engine >XMAXKEY_DESC= Change max key length from 1000 to 4000 >X >XOPTIONS_DEFAULT+= MAXKEY >X.endif >X >X.include <bsd.port.options.mk> >X >X.if ${OSVERSION} < 1000052 >XLIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo >X.endif >X >X.if ${OSVERSION} < 1000012 >XCMAKE_ARGS+= -DWITH_JEMALLOC="bundled" >X.else >XCMAKE_ARGS+= -DWITH_JEMALLOC="system" >X.endif >X >X.if ${PORT_OPTIONS:MSSL} >X.if exists(${LOCALBASE}/include/openssl/opensslv.h) >X. if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL} >XIGNORE= security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl >X. endif >X.endif >X.if ${PORT_OPTIONS:MOPENSSL} >XUSE_OPENSSL= yes >X.if !${PORT_OPTIONS:MPORTSSL} >XWITH_OPENSSL_BASE= yes >X.else >XWITH_OPENSSL_PORT= yes >X.endif >XCMAKE_ARGS+= -DWITH_SSL=yes >X.else >XCMAKE_ARGS+= -DWITH_SSL=bundled >X.endif >X.else >XCMAKE_FLAGS+= -DWITH_SSL=no >X.endif >X.if ${PORT_OPTIONS:MFASTMTX} >XCMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 >X.endif >X >X# MySQL-Server part >X.if !defined(CLIENT_ONLY) >XUSE_MYSQL= yes >XWANT_MYSQL_VER= 100m >X >XCONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-* >X >XUSE_RC_SUBR= mysql-server >X >XUSERS= mysql >XGROUPS= mysql >X >XCMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ >X -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 >X >Xpost-install: >X.if !defined(PACKAGE_BUILDING) >X @${CAT} ${PKGMESSAGE} >X.endif >X >X.if empty(PORT_OPTIONS:MOQGRAPH) >XCMAKE_ARGS+= -DWITHOUT_OQGRAPH=1 >XPLIST_SUB+= OQGRAPH="@comment " >X.else >XUSE_GCC?= yes >XCMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1 >XPLIST_SUB+= OQGRAPH="" >XLIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs >X.endif >X.if ${PORT_OPTIONS:MMAXKEY} >XEXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h >X.endif >X.else >XUSES+= readline >X.endif >X >Xpost-patch: >X @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt >X @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c >X @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh >X >X.include <bsd.port.pre.mk> >X >X.if ${ARCH} == "arm" >XBROKEN= Does not compile on arm >X.endif >X >X.include <bsd.port.post.mk> >34328fea9423bd89b2e5e58ec89f1a09 >echo x - databases/mariadb100-server/pkg-descr >sed 's/^X//' >databases/mariadb100-server/pkg-descr << '60058ef95d1c8b76fb1192886b29938b' >XMariaDB is a database server that offers drop-in replacement functionality for >XMySQL. MariaDB is built by some of the original authors of MySQL, with >Xassistance from the broader community of Free and open source software >Xdevelopers. In addition to the core functionality of MySQL, MariaDB offers a >Xrich set of feature enhancements including alternate storage engines, server >Xoptimizations, and patches. >X >XMariaDB is primarily driven by developers at Monty Program, a company founded by >XMichael "Monty" Widenius, the original author of MySQL, but this is not the >Xwhole story about MariaDB. On the "About MariaDB" page you will find more >Xinformation about all participants in the MariaDB community, including storage >Xengines XtraDB and PBXT. >X >XWWW: http://mariadb.org/ >60058ef95d1c8b76fb1192886b29938b >echo x - databases/mariadb100-server/pkg-plist >sed 's/^X//' >databases/mariadb100-server/pkg-plist << 'b70e5f940f2e00253a8d8e5c2a967595' >X@stopdaemon mysql-server >Xbin/aria_chk >Xbin/aria_dump_log >Xbin/aria_ftdump >Xbin/aria_pack >Xbin/aria_read_log >Xbin/innochecksum >Xbin/my_print_defaults >Xbin/myisam_ftdump >Xbin/myisamchk >Xbin/myisamlog >Xbin/myisampack >Xbin/mysql_client_test >Xbin/mysql_client_test_embedded >Xbin/mysql_convert_table_format >Xbin/mysql_embedded >Xbin/mysql_fix_extensions >Xbin/mysql_install_db >Xbin/mysql_plugin >Xbin/mysql_secure_installation >Xbin/mysql_setpermission >Xbin/mysql_tzinfo_to_sql >Xbin/mysql_upgrade >Xbin/mysql_zap >Xbin/mysqlbug >Xbin/mysqld_multi >Xbin/mysqld_safe >Xbin/mysqldumpslow >Xbin/mysqlhotcopy >Xbin/mysqltest >Xbin/mysqltest_embedded >Xbin/mytop >Xbin/perror >Xbin/replace >Xbin/resolve_stack_dump >Xbin/resolveip >Xlib/mysql/libmysqld.a >Xlib/mysql/libmysqld.so.18 >Xlib/mysql/plugin/adt_null.so >Xlib/mysql/plugin/auth_0x0100.so >Xlib/mysql/plugin/auth_pam.so >Xlib/mysql/plugin/auth_test_plugin.so >Xlib/mysql/plugin/daemon_example.ini >Xlib/mysql/plugin/dialog.so >Xlib/mysql/plugin/dialog_examples.so >Xlib/mysql/plugin/feedback.so >Xlib/mysql/plugin/ha_archive.so >Xlib/mysql/plugin/ha_blackhole.so >Xlib/mysql/plugin/ha_connect.so >Xlib/mysql/plugin/ha_federated.so >Xlib/mysql/plugin/ha_federatedx.so >Xlib/mysql/plugin/ha_innodb.so >X%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so >Xlib/mysql/plugin/ha_sequence.so >Xlib/mysql/plugin/ha_sphinx.so >Xlib/mysql/plugin/ha_spider.so >Xlib/mysql/plugin/ha_test_sql_discovery.so >Xlib/mysql/plugin/handlersocket.so >Xlib/mysql/plugin/libdaemon_example.so >Xlib/mysql/plugin/locales.so >Xlib/mysql/plugin/metadata_lock_info.so >Xlib/mysql/plugin/mypluglib.so >Xlib/mysql/plugin/mysql_clear_password.so >Xlib/mysql/plugin/qa_auth_client.so >Xlib/mysql/plugin/qa_auth_interface.so >Xlib/mysql/plugin/qa_auth_server.so >Xlib/mysql/plugin/query_cache_info.so >Xlib/mysql/plugin/query_response_time.so >Xlib/mysql/plugin/semisync_master.so >Xlib/mysql/plugin/semisync_slave.so >Xlib/mysql/plugin/server_audit.so >Xlib/mysql/plugin/sql_errlog.so >Xlibexec/mysqld >Xman/man1/aria_chk.1.gz >Xman/man1/aria_dump_log.1.gz >Xman/man1/aria_ftdump.1.gz >Xman/man1/aria_pack.1.gz >Xman/man1/aria_read_log.1.gz >Xman/man1/innochecksum.1.gz >Xman/man1/my_print_defaults.1.gz >Xman/man1/myisam_ftdump.1.gz >Xman/man1/myisamchk.1.gz >Xman/man1/myisamlog.1.gz >Xman/man1/myisampack.1.gz >Xman/man1/mysql.server.1.gz >Xman/man1/mysql_convert_table_format.1.gz >Xman/man1/mysql_fix_extensions.1.gz >Xman/man1/mysql_install_db.1.gz >Xman/man1/mysql_secure_installation.1.gz >Xman/man1/mysql_setpermission.1.gz >Xman/man1/mysql_tzinfo_to_sql.1.gz >Xman/man1/mysql_upgrade.1.gz >Xman/man1/mysql_zap.1.gz >Xman/man1/mysqlbug.1.gz >Xman/man1/mysqld_multi.1.gz >Xman/man1/mysqld_safe.1.gz >Xman/man1/mysqldumpslow.1.gz >Xman/man1/mysqlhotcopy.1.gz >Xman/man1/mysqltest.1.gz >Xman/man1/perror.1.gz >Xman/man1/replace.1.gz >Xman/man1/resolve_stack_dump.1.gz >Xman/man1/resolveip.1.gz >Xman/man8/mysqld.8.gz >X%%DATADIR%%/binary-configure >X%%DATADIR%%/charsets/Index.xml >X%%DATADIR%%/charsets/README >X%%DATADIR%%/charsets/armscii8.xml >X%%DATADIR%%/charsets/ascii.xml >X%%DATADIR%%/charsets/cp1250.xml >X%%DATADIR%%/charsets/cp1251.xml >X%%DATADIR%%/charsets/cp1256.xml >X%%DATADIR%%/charsets/cp1257.xml >X%%DATADIR%%/charsets/cp850.xml >X%%DATADIR%%/charsets/cp852.xml >X%%DATADIR%%/charsets/cp866.xml >X%%DATADIR%%/charsets/dec8.xml >X%%DATADIR%%/charsets/geostd8.xml >X%%DATADIR%%/charsets/greek.xml >X%%DATADIR%%/charsets/hebrew.xml >X%%DATADIR%%/charsets/hp8.xml >X%%DATADIR%%/charsets/keybcs2.xml >X%%DATADIR%%/charsets/koi8r.xml >X%%DATADIR%%/charsets/koi8u.xml >X%%DATADIR%%/charsets/latin1.xml >X%%DATADIR%%/charsets/latin2.xml >X%%DATADIR%%/charsets/latin5.xml >X%%DATADIR%%/charsets/latin7.xml >X%%DATADIR%%/charsets/macce.xml >X%%DATADIR%%/charsets/macroman.xml >X%%DATADIR%%/charsets/swe7.xml >X%%DATADIR%%/czech/errmsg.sys >X%%DATADIR%%/danish/errmsg.sys >X%%DATADIR%%/dutch/errmsg.sys >X%%DATADIR%%/english/errmsg.sys >X%%DATADIR%%/errmsg-utf8.txt >X%%DATADIR%%/estonian/errmsg.sys >X%%DATADIR%%/fill_help_tables.sql >X%%DATADIR%%/french/errmsg.sys >X%%DATADIR%%/german/errmsg.sys >X%%DATADIR%%/greek/errmsg.sys >X%%DATADIR%%/hungarian/errmsg.sys >X%%DATADIR%%/install_spider.sql >X%%DATADIR%%/italian/errmsg.sys >X%%DATADIR%%/japanese/errmsg.sys >X%%DATADIR%%/korean/errmsg.sys >X%%DATADIR%%/magic >X%%DATADIR%%/my-huge.cnf >X%%DATADIR%%/my-innodb-heavy-4G.cnf >X%%DATADIR%%/my-large.cnf >X%%DATADIR%%/my-medium.cnf >X%%DATADIR%%/my-small.cnf >X%%DATADIR%%/mysql-log-rotate >X%%DATADIR%%/mysql.server >X%%DATADIR%%/mysql_performance_tables.sql >X%%DATADIR%%/mysql_system_tables.sql >X%%DATADIR%%/mysql_system_tables_data.sql >X%%DATADIR%%/mysql_test_data_timezone.sql >X%%DATADIR%%/mysqld_multi.server >X%%DATADIR%%/norwegian-ny/errmsg.sys >X%%DATADIR%%/norwegian/errmsg.sys >X%%DATADIR%%/polish/errmsg.sys >X%%DATADIR%%/portuguese/errmsg.sys >X%%DATADIR%%/romanian/errmsg.sys >X%%DATADIR%%/russian/errmsg.sys >X%%DATADIR%%/serbian/errmsg.sys >X%%DATADIR%%/slovak/errmsg.sys >X%%DATADIR%%/spanish/errmsg.sys >X%%DATADIR%%/swedish/errmsg.sys >X%%DATADIR%%/ukrainian/errmsg.sys >X@dirrm lib/mysql/plugin >X@dirrmtry lib/mysql >X@dirrm %%DATADIR%%/charsets >X@dirrm %%DATADIR%%/czech >X@dirrm %%DATADIR%%/danish >X@dirrm %%DATADIR%%/dutch >X@dirrm %%DATADIR%%/english >X@dirrm %%DATADIR%%/estonian >X@dirrm %%DATADIR%%/french >X@dirrm %%DATADIR%%/german >X@dirrm %%DATADIR%%/greek >X@dirrm %%DATADIR%%/hungarian >X@dirrm %%DATADIR%%/italian >X@dirrm %%DATADIR%%/japanese >X@dirrm %%DATADIR%%/korean >X@dirrm %%DATADIR%%/norwegian >X@dirrm %%DATADIR%%/norwegian-ny >X@dirrm %%DATADIR%%/polish >X@dirrm %%DATADIR%%/portuguese >X@dirrm %%DATADIR%%/romanian >X@dirrm %%DATADIR%%/russian >X@dirrm %%DATADIR%%/serbian >X@dirrm %%DATADIR%%/slovak >X@dirrm %%DATADIR%%/spanish >X@dirrm %%DATADIR%%/sql-bench >X@dirrm %%DATADIR%%/swedish >X@dirrm %%DATADIR%%/tests >X@dirrm %%DATADIR%%/ukrainian >X@dirrm %%DATADIR%% >b70e5f940f2e00253a8d8e5c2a967595 >exit >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 193539
:
147194
| 147249 |
147316
|
147317
|
147518
|
147718
|
147719
|
147720
|
147721