Index: branches/2018Q1/databases/mariadb100-server/Makefile =================================================================== --- branches/2018Q1/databases/mariadb100-server/Makefile (revision 461657) +++ branches/2018Q1/databases/mariadb100-server/Makefile (revision 461658) @@ -1,177 +1,175 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.33 +PORTVERSION= 10.0.34 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 #LICENSE_FILE= ${WRKSRC}/COPYING 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 BROKEN_aarch64= Fails to link: missing sbrk SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake:noninja compiler:c++11-lib cpe \ ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX NO_OPTIONS_SORT= yes FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ -DINSTALL_DOCREADMEDIR="share/doc/mariadb" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBEDIT=0 \ -DWITH_SSL=${OPENSSLBASE} \ -DWITH_LIBWRAP=1 \ -DCOMPILATION_COMMENT="FreeBSD Ports" 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[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB ENGINES_DESC= Optional MariaDB storage engines INNOBASE_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine OPTIONS_SUB= yes .endif FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline .else # MySQL-Server part BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory USES+= mysql:100m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 .endfor +INNOBASE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-MDEV-15288 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy -# Currently OQGraph does not build using clang. -# See See https://mariadb.atlassian.net/browse/MDEV-8051. -OQGRAPH_USE= gcc +# See https://mariadb.atlassian.net/browse/MDEV-15291. OQGRAPH_BROKEN= OQGraph does not build TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= PATENTS README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi post-install: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now . for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4 ${RM} ${STAGEDIR}${PREFIX}/${f} . endfor ${RM} -r ${STAGEDIR}${DATADIR}/SELinux .endif .include .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MTOKUDB} NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif .if ${ARCH} == 'i386' # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif post-extract-OQGRAPH-off: @${RM} -r ${WRKSRC}/storage/oqgraph post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif post-configure-MROONGA-on: ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include Index: branches/2018Q1/databases/mariadb100-server/distinfo =================================================================== --- branches/2018Q1/databases/mariadb100-server/distinfo (revision 461657) +++ branches/2018Q1/databases/mariadb100-server/distinfo (revision 461658) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509742954 -SHA256 (mariadb-10.0.33.tar.gz) = e3e3d583c51761aee2fcd0e51bfa7d592c1299cf5eb977e61ea9dc72932e8870 -SIZE (mariadb-10.0.33.tar.gz) = 69211872 +TIMESTAMP = 1517385452 +SHA256 (mariadb-10.0.34.tar.gz) = c5bb2a67dcce84ef39b59a63728a3d2a0196226041416491f0bc22d3388173ac +SIZE (mariadb-10.0.34.tar.gz) = 69266294 Index: branches/2018Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake =================================================================== --- branches/2018Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake (revision 461657) +++ branches/2018Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake (nonexistent) @@ -1,26 +0,0 @@ -From c4c48e974013a1a3d62ae6b2fc9a705c3bdd1689 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik -Date: Tue, 7 Mar 2017 19:21:42 +0100 -Subject: [PATCH] MDEV-11965 -Werror should not appear in released tarballs - ---- - storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -index 769bdffa5d99..c17e119d1cdc 100644 ---- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig -+++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -196,9 +196,9 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) - set_cflags_if_supported(-Wcast-align) - endif () - --## always want these --set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}") --set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}") -+## always want these in debug builds -+set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}") -+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}") - - # pick language dialect - set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") Property changes on: branches/2018Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake ___________________________________________________________________ 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/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288 =================================================================== --- branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288 (nonexistent) +++ branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288 (revision 461658) @@ -0,0 +1,7 @@ +--- storage/innobase/CMakeLists.txt.orig 2018-01-27 18:40:38 UTC ++++ storage/innobase/CMakeLists.txt +@@ -489,4 +489,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU + MODULE_OUTPUT_NAME ha_innodb + LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT}) + +-ADD_DEPENDENCIES(innobase GenError) Property changes on: branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt =================================================================== --- branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt (revision 461657) +++ branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt (revision 461658) @@ -1,18 +1,26 @@ ---- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 -+++ CMakeLists.txt 2017-05-23 20:53:22.017238000 +0200 -@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +--- CMakeLists.txt.orig 2018-01-27 18:40:35 UTC ++++ CMakeLists.txt +@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(support-files) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) +@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) # MDEV-6526 these files are not installed anymore -@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP +@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() +ENDIF() INCLUDE(CPack) Index: branches/2018Q1/databases/mariadb100-server/pkg-plist =================================================================== --- branches/2018Q1/databases/mariadb100-server/pkg-plist (revision 461657) +++ branches/2018Q1/databases/mariadb100-server/pkg-plist (revision 461658) @@ -1,237 +1,236 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/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 %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump include/mysql/private/atomic/gcc_builtins.h include/mysql/private/atomic/generic-msvc.h include/mysql/private/atomic/nolock.h include/mysql/private/atomic/rwlock.h include/mysql/private/atomic/solaris.h include/mysql/private/atomic/x86-gcc.h include/mysql/private/base64.h include/mysql/private/config.h include/mysql/private/embedded_priv.h include/mysql/private/ft_global.h include/mysql/private/hash.h include/mysql/private/heap.h include/mysql/private/lf.h include/mysql/private/maria.h include/mysql/private/my_aes.h include/mysql/private/my_alarm.h include/mysql/private/my_atomic.h include/mysql/private/my_base.h include/mysql/private/my_bit.h include/mysql/private/my_bitmap.h include/mysql/private/my_check_opt.h include/mysql/private/my_compare.h include/mysql/private/my_context.h include/mysql/private/my_cpu.h include/mysql/private/my_default.h include/mysql/private/my_handler_errors.h include/mysql/private/my_libwrap.h include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_rnd.h include/mysql/private/my_stacktrace.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h include/mysql/private/my_user.h include/mysql/private/myisam.h include/mysql/private/myisamchk.h include/mysql/private/myisammrg.h include/mysql/private/myisampack.h include/mysql/private/mysql_async.h include/mysql/private/mysqld_default_groups.h include/mysql/private/mysys_err.h include/mysql/private/password.h include/mysql/private/probes_mysql.h include/mysql/private/probes_mysql_nodtrace.h include/mysql/private/queues.h include/mysql/private/rijndael.h include/mysql/private/service_versions.h include/mysql/private/sha1.h include/mysql/private/sha2.h include/mysql/private/t_ctype.h include/mysql/private/thr_alarm.h include/mysql/private/thr_lock.h include/mysql/private/thread_pool_priv.h include/mysql/private/violite.h include/mysql/private/waiting_threads.h include/mysql/private/welcome_copyright_notice.h include/mysql/private/wqueue.h lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/feedback.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%INNOBASE%%lib/mysql/plugin/ha_innodb.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so lib/mysql/plugin/ha_sequence.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/mysql_clear_password.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/sql_errlog.so libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/innochecksum.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 461657) +++ branches/2018Q1 (revision 461658) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r461610