Index: branches/2019Q2/databases/mariadb102-client/Makefile =================================================================== --- branches/2019Q2/databases/mariadb102-client/Makefile (revision 501255) +++ branches/2019Q2/databases/mariadb102-client/Makefile (revision 501256) @@ -1,41 +1,14 @@ # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 102-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mariadb102-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ - -DCONC_WITH_UNITTEST=0 \ - -DCONC_WITH_MYSQLCOMPAT=1 \ - -DWITH_WSREP=0 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -CLIENT_ONLY= yes - -post-configure: - ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ - ${WRKDIR}/.build/libmariadb/mariadb_config/mariadb_config.c - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \ - ${STAGEDIR}${PREFIX}/man/man1/aria* \ - ${STAGEDIR}${PREFIX}/man/man1/myisam* - ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \ - ${STAGEDIR}${DATADIR}/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server - # Fix https://mariadb.atlassian.net/browse/MDEV-9388 - @${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config - -post-install-GSSAPI_NONE: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - .include "${MASTERDIR}/Makefile" Index: branches/2019Q2/databases/mariadb102-server/Makefile =================================================================== --- branches/2019Q2/databases/mariadb102-server/Makefile (revision 501255) +++ branches/2019Q2/databases/mariadb102-server/Makefile (revision 501256) @@ -1,219 +1,233 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.22 +PORTVERSION= 10.2.24 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= 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}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 102-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE -.if !defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine XTRADB_DESC= Build XtraDB engine next to InnoDB ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit 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" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ - -DWITH_JEMALLOC="system" \ - -DWITH_LIBWRAP=1 \ -DWITH_SSL="${OPENSSLBASE}" \ - -DWITH_UNIT_TESTS=0 \ - -DWITHOUT_DOCS=1 \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \ -DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \ -DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \ -DREMOTEIO_PLUGIN_TYPE="NO" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} +CMAKE_ON+= WITH_LIBWRAP WITH_JEMALLOC WITHOUT_DOCS +CMAKE_OFF+= WITH_UNIT_TESTS DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO OPTIONS_SUB= yes -.if defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part +USE_LDCONFIG= ${PREFIX}/lib/mysql USES+= readline -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO +CMAKE_ON+= WITHOUT_SERVER CONC_WITH_MYSQLCOMPAT +CMAKE_OFF+= WITH_WSREP .else # MySQL-Server part USES+= mysql:102m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_CLIENT=1 +CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER WITHOUT_EXAMPLE_STORAGE_ENGINE .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_USE= gnome=libxml2 -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO -LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON +GSSAPI_NONE_CMAKE_ON+= -DPLUGIN_AUTH_GSSAPI=NO +LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF -LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON +LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON +SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON +ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd +.endif # ${PKGNAMESUFFIX:M*-client} -#NOT_FOR_ARCHS= i386 -#NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ -# https://jira.mariadb.org/browse/MDEV-9627 - -post-install: -# Remove programs to avoid conflict with mariadb102-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 - ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ - ${STAGEDIR}/${PREFIX}/share/pkgconfig - ${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient* - ${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \ - ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \ - ${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ - ${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \ - ${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \ - ${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING - ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h -.endif # defined(CLIENT_ONLY) - .include .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${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 .endif + +post-configure: + ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ + -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ + ${WRKDIR}/.build/libmariadb/mariadb_config/mariadb_config.c + +.if ${PKGNAMESUFFIX:M*-client} # targets for -client +post-install: + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \ + ${STAGEDIR}${PREFIX}/man/man1/aria* \ + ${STAGEDIR}${PREFIX}/man/man1/myisam* + ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \ + ${STAGEDIR}${DATADIR}/policy \ + ${STAGEDIR}${PREFIX}/include/mysql/server + # Fix https://mariadb.atlassian.net/browse/MDEV-9388 + @${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config + +post-install-GSSAPI_NONE: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so + +.else # targets for -server + +post-install: +# Remove programs to avoid conflict with mariadb102-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 + ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ + ${STAGEDIR}/${PREFIX}/share/pkgconfig \ + ${STAGEDIR}${DATADIR}/charsets + ${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient* + ${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \ + ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \ + ${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ + ${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \ + ${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \ + ${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING + ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h + +.endif # targets for -server .include Index: branches/2019Q2/databases/mariadb102-server/distinfo =================================================================== --- branches/2019Q2/databases/mariadb102-server/distinfo (revision 501255) +++ branches/2019Q2/databases/mariadb102-server/distinfo (revision 501256) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549889973 -SHA256 (mariadb-10.2.22.tar.gz) = 42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c -SIZE (mariadb-10.2.22.tar.gz) = 71907765 +TIMESTAMP = 1557489019 +SHA256 (mariadb-10.2.24.tar.gz) = 97f4d924e69f77abb2f650116785c2f5ef356230442534ebcbaadb51d9bb8bc4 +SIZE (mariadb-10.2.24.tar.gz) = 71965656 Index: branches/2019Q2/databases/mariadb102-server/files/patch-client_CMakeLists.txt =================================================================== --- branches/2019Q2/databases/mariadb102-server/files/patch-client_CMakeLists.txt (revision 501255) +++ branches/2019Q2/databases/mariadb102-server/files/patch-client_CMakeLists.txt (nonexistent) @@ -1,77 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-02-09 23:24:08 UTC -+++ client/CMakeLists.txt -@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) - SET(CLIENT_LIB mariadbclient mysys) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+ -+IF(NOT WITHOUT_CLIENT) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc - ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) -@@ -44,12 +46,6 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - --MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) --SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) --SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) - -@@ -61,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) - --MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) --TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB}) --ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -- --MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) --TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB}) -- --MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) --TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) -- - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) - -@@ -90,12 +76,32 @@ ENDIF(WIN32) - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example - PROPERTIES HAS_CXX TRUE) - -- --FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog -+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog - mysqladmin mysqlslap async_example) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ -+ENDIF() -+ -+MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) -+SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -+TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) -+SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ -+MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) -+TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB}) -+ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ -+MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) -+TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) -+ -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin -+PROPERTIES HAS_CXX TRUE) -+ -+FOREACH(t mysqltest mysql_plugin mysql_upgrade) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH() - Property changes on: branches/2019Q2/databases/mariadb102-server/files/patch-client_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q2/databases/mariadb102-server/pkg-plist =================================================================== --- branches/2019Q2/databases/mariadb102-server/pkg-plist (revision 501255) +++ branches/2019Q2/databases/mariadb102-server/pkg-plist (revision 501256) @@ -1,194 +1,212 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/mariabackup bin/mbstream 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 %%ROCKSDB%%bin/mysql_ldb %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded @comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump bin/wsrep_sst_common bin/wsrep_sst_mariabackup bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_rsync_wan bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 include/mysql/server/private/embedded_priv.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/libmariadbclient.a lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.19 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so @comment lib/mysql/plugin/caching_sha2_password.so @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/example_key_management.so lib/mysql/plugin/file_key_management.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 %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.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/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/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/wsrep_info.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/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz man/man1/mariabackup.1.gz man/man1/mariadb-service-convert.1.gz man/man1/mbstream.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_ldb.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/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.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 %%TOKUDB%%man/man1/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz man/man1/wsrep_sst_common.1.gz man/man1/wsrep_sst_mariabackup.1.gz man/man1/wsrep_sst_mysqldump.1.gz man/man1/wsrep_sst_rsync.1.gz man/man1/wsrep_sst_rsync_wan.1.gz man/man1/wsrep_sst_xtrabackup-v2.1.gz man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%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%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS %%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%%/mysql_to_mariadb.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 %%DATADIR%%/wsrep.cnf %%DATADIR%%/wsrep_notify %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md +@comment bin/mariadb_config +@comment bin/mysql +@comment bin/mysqladmin +@comment bin/mysqlbinlog +@comment bin/mysqlcheck +@comment bin/mysqldump +@comment bin/mysqlimport +@comment bin/mysqlshow +@comment bin/mysqlslap +@comment include/mysql/mariadb/ma_io.h +@comment include/mysql/mysql/client_plugin.h +@comment include/mysql/mysql/plugin_auth.h +@comment include/mysql/mysql/plugin_auth_common.h +@comment lib/mysql/plugin/auth_gssapi_client.so +@comment lib/mysql/plugin/client_ed25519.so +@comment lib/mysql/plugin/mysql_clear_password.so +@comment lib/mysql/plugin/sha256_password.so +@comment libdata/pkgconfig/libmariadb.pc Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 501255) +++ branches/2019Q2 (revision 501256) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r501255