From 21bc38e2d23dad736e23079d386ccc3ba09827a7 Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Tue, 7 Jun 2011 07:11:25 +0000 Subject: [PATCH] Split databases/mariadb into -client, -scripts, and -server ports Upgrade to version 5.2.6 [1] Bring default compilation options into line with standard mariadb releases, per http://kb.askmonty.org/v/generic-build-instructions [1] Submitted by: maintainer [1] Approved by: maintainer --- MOVED | 1 + UPDATING | 13 + databases/Makefile | 4 +- databases/mariadb-client/Makefile | 3 +- databases/mariadb-scripts/Makefile | 3 - databases/mariadb-server/Makefile | 82 +++-- databases/mariadb-server/distinfo | 4 +- databases/mariadb-server/files/pkg-message.in | 7 + databases/mariadb-server/pkg-message | 5 - databases/mariadb-server/pkg-plist | 92 ++--- databases/mariadb/Makefile | 246 -------------- databases/mariadb/distinfo | 2 - databases/mariadb/files/mysql-server.in | 73 ---- .../patch-extra::yassl::src::yassl_error.cpp | 13 - databases/mariadb/files/patch-sql::mysqld.cc | 14 - databases/mariadb/pkg-descr | 14 - databases/mariadb/pkg-message | 5 - databases/mariadb/pkg-plist | 321 ------------------ 18 files changed, 132 insertions(+), 770 deletions(-) create mode 100644 databases/mariadb-server/files/pkg-message.in delete mode 100644 databases/mariadb-server/pkg-message delete mode 100644 databases/mariadb/Makefile delete mode 100644 databases/mariadb/distinfo delete mode 100644 databases/mariadb/files/mysql-server.in delete mode 100644 databases/mariadb/files/patch-extra::yassl::src::yassl_error.cpp delete mode 100644 databases/mariadb/files/patch-sql::mysqld.cc delete mode 100644 databases/mariadb/pkg-descr delete mode 100644 databases/mariadb/pkg-message delete mode 100644 databases/mariadb/pkg-plist diff --git a/MOVED b/MOVED index 526bd8516db2..482185f42f1e 100644 --- a/MOVED +++ b/MOVED @@ -2215,3 +2215,4 @@ net-p2p/qbittorrent26-nox11|net-p2p/qbittorrent28-nox11|2011-06-05|Old version n net-p2p/qbittorrent27|net-p2p/qbittorrent28|2011-06-05|Old version no longer updated net-p2p/qbittorrent27-nox11|net-p2p/qbittorrent28-nox11|2011-06-05|Old version no longer updated www/pubcookie-login-server||2011-06-06|Has expired: Unused by maintiner, needs updates. +databases/mariadb||2011-06-06|Split into databases/mariadb-{client|scripts|server} diff --git a/UPDATING b/UPDATING index 380d58d8ed08..70692b0a03bb 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20110606: + AFFECTS: users of databases/mariadb + AUTHOR: dougb@FreeBSD.org + + The mariadb port has been split into -client, -scripts, and -server ports + ala mysql. You can now install only the parts that you need. + + If you have devel/libevent installed along with mariadb you should do + something like: + + pkg_delete mariadb\* + portmaster devel/libevent + 20110605: AFFECTS: users of security/gnutls and any port that depends on it AUTHOR: novel@FreeBSD.org diff --git a/databases/Makefile b/databases/Makefile index b38a54fb8f23..fc70c86eba82 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -184,7 +184,9 @@ SUBDIR += ludia SUBDIR += maatkit SUBDIR += mantis - SUBDIR += mariadb + SUBDIR += mariadb-client + SUBDIR += mariadb-scripts + SUBDIR += mariadb-server SUBDIR += mdbtools SUBDIR += memcached SUBDIR += memcached12 diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index c63c02509257..f72ebb735e01 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -14,11 +14,10 @@ MARIADB_CLIENT_SLAVE= yes CONFIGURE_ARGS= --without-server --with-libevent=no -IGNORE= Post repo-copy, not ready for use yet +OPTIONS= THREADSAFE "Build thread-safe client" On CONFLICTS= mysql-client-[0-9]* -PKGMESSAGE= /nonexistent # To avoid equivalent in master port PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile index 9d770812ac71..44451d6eebce 100644 --- a/databases/mariadb-scripts/Makefile +++ b/databases/mariadb-scripts/Makefile @@ -14,11 +14,8 @@ USE_PERL5= yes MASTERDIR= ${.CURDIR}/../mariadb-server MARIADB_SCRIPTS_SLAVE= yes -IGNORE= Post repo-copy, not ready for use yet - CONFLICTS= mysql-scripts-[0-9]* -PKGMESSAGE= /nonexistent # To avoid equivalent in master port PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 936ace8bc922..6f3b49aa450e 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -6,9 +6,9 @@ PORTNAME= mariadb PKGNAMESUFFIX?= -server -PORTVERSION= 5.2.5 +PORTVERSION= 5.2.6 PORTREVISION?= 0 -CATEGORIES= databases +CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ @@ -22,16 +22,11 @@ MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION MAINTAINER= dgeo@centrale-marseille.fr COMMENT?= Database server - drop-in replacement for MySQL -IGNORE= Post repo-copy, not ready for use yet - CONFLICTS?= mysql-server-[0-9]* GNU_CONFIGURE= yes .if !defined(MARIADB_SCRIPTS_SLAVE) -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} -LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent - CPPFLAGS+= -I${LOCALBASE}/include DATADIR= ${PREFIX}/share/mysql @@ -40,12 +35,16 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql USERS= mysql GROUPS= mysql -OPTIONS= SSL "Activate SSL support (yassl)" Off \ +OPTIONS+= STATIC "Build statically linked" On \ + SSL "Activate SSL support (yassl)" On \ OPENSSL "Use OpenSSL instead of bundled yassl" Off MAKE_JOBS_SAFE= yes .if !defined(MARIADB_CLIENT_SLAVE) +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent + MAN1= innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \ mysql_install_db.1 mysql_tzinfo_to_sql.1 mysql_waitpid.1 mysqld_safe.1 \ @@ -56,21 +55,21 @@ LICENSE= GPLv2 INFO= mysql -CONFIGURE_ARGS= --with-embedded-server +CONFIGURE_ARGS+= --with-embedded-server --enable-local-infile USE_RC_SUBR= mysql-server OPTIONS+= ARIADB "Aria storage engine" On \ ARCHIVE "Archive storage plugin" On \ BLACKHOLE "Blackhole storage engine" On \ + SPHINX "SE client for Sphinx search daemon" On \ + FEDX "FederatedX storage engine (Federated replacement)" On \ FEDERATED "Federated (old) storage engine" Off \ - FEDERATEDX "FederatedX storage engine (Federated replacement)" On \ - INNODB "InnoDB (old) engine" Off \ XTRADB "XtraDB (InnoDB replacement) engine" On \ + INNODB "InnoDB (old) engine" Off \ OQGRAPH "Open Query Graph Computation engine" Off \ PBXT "MVCC-based transactional engine" Off \ PARTITION "Partitioning support" Off \ - SPHINX "SE client for Sphinx search daemon" On \ - NDB "Enable NDB support (imply PARTITION)" Off \ + NDB "Enable NDB support (implies PARTITION)" Off \ EXAMPLES "Example engine,daemon and ftsearch plugins" Off .endif # .if !defined(MARIADB_CLIENT_SLAVE) @@ -79,6 +78,9 @@ OPTIONS+= ARIADB "Aria storage engine" On \ .if ${ARCH} == "i386" || ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-assembler .endif +.if ${ARCH} == "i386" +CONFIGURE_ARGS+= --with-big-tables +.endif .if defined(WITH_SSL) .if defined(WITH_OPENSSL) USE_OPENSSL= yes @@ -90,59 +92,67 @@ MDB_EXTRA_SUBDIRS= extra .else CONFIGURE_ARGS+= --without-ssl .endif +.if defined(WITH_STATIC) +CONFIGURE_ARGS+= --with-client-ldflags="-static -all-static" +.endif +.if defined(WITH_THREADSAFE) +CONFIGURE_ARGS+= --enable-thread-safe-client +.endif .if !defined(MARIADB_CLIENT_SLAVE) .if defined(WITH_ARIADB) PLIST_SUB+= ARIADB="" CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables +PLUGINS+= aria .else CONFIGURE_ARGS+= --without-plugin-aria PLIST_SUB+= ARIADB="@comment " .endif .if defined(WITH_SPHINX) PLIST_SUB+= SPHINX="" +PLUGINS+= sphinx .else CONFIGURE_ARGS+= --without-plugin-sphinx PLIST_SUB+= SPHINX="@comment " .endif -.if defined(WITH_ARIADB) -PLIST_SUB+= ARIADB="" -.else -CONFIGURE_ARGS+= --without-plugin-aria -PLIST_SUB+= ARIADB="@comment " -.endif .if defined(WITH_ARCHIVE) PLIST_SUB+= ARCHIVE="" +PLUGINS+= archive .else CONFIGURE_ARGS+= --without-plugin-archive PLIST_SUB+= ARCHIVE="@comment " .endif .if defined(WITH_BLACKHOLE) PLIST_SUB+= BLACKHOLE="" +PLUGINS+= blackhole .else CONFIGURE_ARGS+= --without-plugin-blackhole PLIST_SUB+= BLACKHOLE="@comment " .endif .if defined(WITH_FEDERATED) PLIST_SUB+= FEDERATED="" +PLUGINS+= federated .else CONFIGURE_ARGS+= --without-plugin-federated PLIST_SUB+= FEDERATED="@comment " .endif -.if defined(WITH_FEDERATEDX) +.if defined(WITH_FEDX) PLIST_SUB+= FEDERATEDX="" +PLUGINS+= federatedx .else CONFIGURE_ARGS+= --without-plugin-federatedx PLIST_SUB+= FEDERATEDX="@comment " .endif .if defined(WITH_INNODB) PLIST_SUB+= INNODB="" +PLUGINS+= innodb_plugin .else CONFIGURE_ARGS+= --without-plugin-innodb_plugin PLIST_SUB+= INNODB="@comment " .endif .if defined(WITH_XTRADB) PLIST_SUB+= XTRADB="" +PLUGINS+= xtradb .else CONFIGURE_ARGS+= --without-plugin-xtradb PLIST_SUB+= XTRADB="@comment " @@ -151,6 +161,7 @@ PLIST_SUB+= XTRADB="@comment " CONFIGURE_ARGS+= --with-plugin-oqgraph PLIST_SUB+= OQGRAPH="" LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs +PLUGINS+= oqgraph .else CONFIGURE_ARGS+= --without-plugin-oqgraph PLIST_SUB+= OQGRAPH="@comment " @@ -158,6 +169,7 @@ PLIST_SUB+= OQGRAPH="@comment " .if defined(WITH_PBXT) CONFIGURE_ARGS+= --with-plugin-pbxt PLIST_SUB+= PBXT="" +PLUGINS+= pbxt .else CONFIGURE_ARGS+= --without-plugin-pbxt PLIST_SUB+= PBXT="@comment " @@ -172,15 +184,23 @@ PLIST_SUB+= EXAMPLES="@comment " CONFIGURE_ARGS+= --with-plugin-ndbcluster WITH_PARTITION=yes PLIST_SUB+= NDB="" +PLUGINS+= ndbcluster .else CONFIGURE_ARGS+= --without-plugin-ndbcluster PLIST_SUB+= NDB="@comment " .endif .if defined(WITH_PARTITION) CONFIGURE_ARGS+= --with-plugin-partition +PLUGINS+= partition .else CONFIGURE_ARGS+= --without-plugin-partition .endif +.if defined(WITH_STATIC) +CONFIGURE_ARGS+= --with-mysqld-ldflags="-static -all-static" --with-plugins="${PLUGINS}" +PLIST_SUB+= STATIC="@comment " +.else +PLIST_SUB+= STATIC="" +.endif .endif # .if !defined(MARIADB_CLIENT_SLAVE) .if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" @@ -188,11 +208,26 @@ CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET} .endif .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+= --with-extra-charsets=${WITH_XCHARSET} +.else +CONFIGURE_ARGS+= --with-extra-charsets=complex .endif .if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION} .endif +.if defined(WITH_STATIC) && ( defined(WITH_OPENSSL) || defined(WITH_NDB) ) +pre-extract: + @${ECHO} '' + @${ECHO} "WITH_STATIC is not compatible with WITH_OPENSSL or WITH_NDB" + @${ECHO} '' + @${FALSE} +.endif + +.if !defined(MARIADB_CLIENT_SLAVE) +.if !defined(WITH_STATIC) +SUB_FILES= pkg-message +.endif + pre-fetch: @${ECHO} '' @${ECHO} ' The following configuration options can be set in /etc/make.conf' @@ -202,10 +237,9 @@ pre-fetch: @${ECHO} " WITH_CHARSET=charset" @${ECHO} " Primary built-in charset (default: latin1, selected: ${WITH_CHARSET})." @${ECHO} " WITH_XCHARSET=list" - @${ECHO} " Other built-in charsets (default: none, selected: ${WITH_XCHARSET})." + @${ECHO} " Other built-in charsets (default: complex, selected: ${WITH_XCHARSET})." @${ECHO} '' -.if !defined(MARIADB_CLIENT_SLAVE) EXTRA_PATCHES= ${FILESDIR}/scripts__Makefile.in MDB_SERVER_SUBDIRS= include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files @@ -218,8 +252,10 @@ post-patch: @${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in @${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in +.if !defined(WITH_STATIC) post-install: - @${CAT} pkg-message + @${CAT} ${PKGMESSAGE} +.endif .endif # .if !defined(MARIADB_CLIENT_SLAVE) .endif # .if !defined(MARIADB_SCRIPTS_SLAVE) diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo index 621b0937ac65..63587ecec290 100644 --- a/databases/mariadb-server/distinfo +++ b/databases/mariadb-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1 -SIZE (mariadb-5.2.5.tar.gz) = 24925585 +SHA256 (mariadb-5.2.6.tar.gz) = 4cf77b7978328e54ce58a2a8c3380e38d8a0039fd2e29d5fa148adbb6b4134c0 +SIZE (mariadb-5.2.6.tar.gz) = 25086148 diff --git a/databases/mariadb-server/files/pkg-message.in b/databases/mariadb-server/files/pkg-message.in new file mode 100644 index 000000000000..831367e52575 --- /dev/null +++ b/databases/mariadb-server/files/pkg-message.in @@ -0,0 +1,7 @@ + +Some optional plugins (those in %%LOCALBASE%%/lib/mysql/plugin/*.so) +must be loaded in /my.cnf. For example: + +[mysqld] +plugin-load=ha_oqgraph.so:ha_federatedx.so + diff --git a/databases/mariadb-server/pkg-message b/databases/mariadb-server/pkg-message deleted file mode 100644 index d1d9d9292c7e..000000000000 --- a/databases/mariadb-server/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -Some optional plugins (those in ${LOCALBASE}/lib/mysql/plugin/*.so) -must be loaded in /my.cnf. For example: - -[mysqld] -plugin-load=ha_xtradb.so:ha_federatedx.so diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist index d0c3637b0c54..5f77cf9e2f77 100644 --- a/databases/mariadb-server/pkg-plist +++ b/databases/mariadb-server/pkg-plist @@ -3,7 +3,7 @@ %%ARIADB%%bin/aria_ftdump %%ARIADB%%bin/aria_pack %%ARIADB%%bin/aria_read_log -bin/innochecksum +%%XTRADB%%bin/innochecksum bin/msql2mysql bin/my_print_defaults bin/myisam_ftdump @@ -96,57 +96,57 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a -lib/mysql/plugin/dialog.a -lib/mysql/plugin/dialog.la -lib/mysql/plugin/dialog.so -lib/mysql/plugin/dialog.so.0 -%%ARCHIVE%%lib/mysql/plugin/ha_archive.a -%%ARCHIVE%%lib/mysql/plugin/ha_archive.la -%%ARCHIVE%%lib/mysql/plugin/ha_archive.so -%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 -%%EXAMPLES%%lib/mysql/plugin/ha_example.a -%%EXAMPLES%%lib/mysql/plugin/ha_example.la -%%EXAMPLES%%lib/mysql/plugin/ha_example.so -%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 -%%EXAMPLES%%lib/mysql/plugin/mypluglib.a -%%EXAMPLES%%lib/mysql/plugin/mypluglib.la -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 -%%FEDERATED%%lib/mysql/plugin/ha_federated.a -%%FEDERATED%%lib/mysql/plugin/ha_federated.la -%%FEDERATED%%lib/mysql/plugin/ha_federated.so -%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 +%%STATIC%%lib/mysql/plugin/dialog.a +%%STATIC%%lib/mysql/plugin/dialog.la +%%STATIC%%lib/mysql/plugin/dialog.so +%%STATIC%%lib/mysql/plugin/dialog.so.0 +%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a +%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la +%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so +%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 +%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a +%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la +%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so +%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.a +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.la +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.a +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.la +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so +%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 +%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.a +%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.la +%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so +%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 +%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a +%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la +%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so +%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 +%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a +%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la +%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so +%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 -%%SPHINX%%lib/mysql/plugin/ha_sphinx.a -%%SPHINX%%lib/mysql/plugin/ha_sphinx.la -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 +%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.a +%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.la +%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so +%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 %%SPHINX%%lib/mysql/plugin/sphinx.a %%SPHINX%%lib/mysql/plugin/sphinx.la %%SPHINX%%lib/mysql/plugin/sphinx.so %%SPHINX%%lib/mysql/plugin/sphinx.so.0 -%%XTRADB%%lib/mysql/plugin/ha_xtradb.a -%%XTRADB%%lib/mysql/plugin/ha_xtradb.la -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 +%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.a +%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.la +%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so +%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd @@ -248,5 +248,5 @@ libexec/mysqld %%NDB%%@dirrm include/mysql/storage/ndb %%NDB%%@dirrm include/mysql/storage @dirrmtry include/mysql -@dirrm lib/mysql/plugin +@dirrmtry lib/mysql/plugin @dirrmtry lib/mysql diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile deleted file mode 100644 index 6d8d4a4fb17a..000000000000 --- a/databases/mariadb/Makefile +++ /dev/null @@ -1,246 +0,0 @@ -# New ports collection makefile for: mariadb -# Date created: 14 November 2010 -# Whom: siasia -# -# $FreeBSD$ -# - -PORTNAME= mariadb -PORTVERSION= 5.2.5 -CATEGORIES= databases -MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://technocation.org/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ - -MAINTAINER= dgeo@centrale-marseille.fr -COMMENT= A database server - drop-in replacement functionality for MySQL - -LICENSE= GPLv2 - -CONFLICTS= mysql-server-[0-9]* mysql-client-[0-9]* mysql-scripts-[0-9]* - -CONFIGURE_ARGS= --with-embedded-server - -CPPFLAGS+= -I${LOCALBASE}/include - -DATADIR= ${PREFIX}/share/mysql -GNU_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/lib/mysql -USE_RC_SUBR= mysql-server - -USERS= mysql -GROUPS= mysql - -INFO= mysql -MAN1= comp_err.1 \ - innochecksum.1 \ - msql2mysql.1 \ - my_print_defaults.1 \ - myisam_ftdump.1 \ - myisamchk.1 \ - myisamlog.1 \ - myisampack.1 \ - mysql-stress-test.pl.1 \ - mysql-test-run.pl.1 \ - mysql.1 \ - mysql.server.1 \ - mysql_client_test.1 \ - mysql_client_test_embedded.1 \ - mysql_config.1 \ - mysql_convert_table_format.1 \ - mysql_find_rows.1 \ - mysql_fix_extensions.1 \ - mysql_fix_privilege_tables.1 \ - mysql_install_db.1 \ - mysql_secure_installation.1 \ - mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 \ - mysql_upgrade.1 \ - mysql_waitpid.1 \ - mysql_zap.1 \ - mysqlaccess.1 \ - mysqladmin.1 \ - mysqlbinlog.1 \ - mysqlbug.1 \ - mysqlcheck.1 \ - mysqld_multi.1 \ - mysqld_safe.1 \ - mysqldump.1 \ - mysqldumpslow.1 \ - mysqlhotcopy.1 \ - mysqlimport.1 \ - mysqlman.1 \ - mysqlshow.1 \ - mysqlslap.1 \ - mysqltest.1 \ - mysqltest_embedded.1 \ - perror.1 \ - replace.1 \ - resolve_stack_dump.1 \ - resolveip.1 -MAN8= mysqld.8 \ - mysqlmanager.8 - -OPTIONS= ARIADB "Aria storage engine" On \ - ARCHIVE "Archive storage plugin" On \ - BLACKHOLE "Blackhole storage engine" On \ - FEDERATED "Federated (old) storage engine" Off \ - FEDERATEDX "FederatedX storage engine (Federated replacement)" On \ - INNODB "InnoDB (old) engine" Off \ - XTRADB "XtraDB (InnoDB replacement) engine" On \ - OQGRAPH "Open Query Graph Computation engine" Off \ - PBXT "MVCC-based transactional engine" Off \ - PARTITION "Partitioning support" Off \ - SPHINX "SE client for Sphinx search daemon" On \ - NDB "Enable NDB support (imply PARTITION)" Off \ - EXAMPLES "Example engine,daemon and ftsearch plugins" Off \ - PORTEVENT "Use libevent from ports" Off \ - SSL "Activate SSL support (yassl)" Off \ - OPENSSL "Use OpenSSL instead of bundled yassl" Off - -.include - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -CONFIGURE_ARGS+= --enable-assembler -.endif -.if defined(WITH_SSL) -.if defined(WITH_OPENSSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.else -CONFIGURE_ARGS+= --with-ssl=bundled -.endif -.else -CONFIGURE_ARGS+= --without-ssl -.endif -.if defined(WITH_PORTEVENT) -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} -LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent -.else -CONFIGURE_ARGS+= --with-libevent=bundled -.endif -.if defined(WITH_ARIADB) -PLIST_SUB+= ARIADB="" -CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables -.else -CONFIGURE_ARGS+= --without-plugin-aria -PLIST_SUB+= ARIADB="@comment " -.endif -.if defined(WITH_SPHINX) -PLIST_SUB+= SPHINX="" -.else -CONFIGURE_ARGS+= --without-plugin-sphinx -PLIST_SUB+= SPHINX="@comment " -.endif -.if defined(WITH_ARIADB) -PLIST_SUB+= ARIADB="" -.else -CONFIGURE_ARGS+= --without-plugin-aria -PLIST_SUB+= ARIADB="@comment " -.endif -.if defined(WITH_ARCHIVE) -PLIST_SUB+= ARCHIVE="" -.else -CONFIGURE_ARGS+= --without-plugin-archive -PLIST_SUB+= ARCHIVE="@comment " -.endif -.if defined(WITH_BLACKHOLE) -PLIST_SUB+= BLACKHOLE="" -.else -CONFIGURE_ARGS+= --without-plugin-blackhole -PLIST_SUB+= BLACKHOLE="@comment " -.endif -.if defined(WITH_FEDERATED) -PLIST_SUB+= FEDERATED="" -.else -CONFIGURE_ARGS+= --without-plugin-federated -PLIST_SUB+= FEDERATED="@comment " -.endif -.if defined(WITH_FEDERATEDX) -PLIST_SUB+= FEDERATEDX="" -.else -CONFIGURE_ARGS+= --without-plugin-federatedx -PLIST_SUB+= FEDERATEDX="@comment " -.endif -.if defined(WITH_INNODB) -PLIST_SUB+= INNODB="" -.else -CONFIGURE_ARGS+= --without-plugin-innodb_plugin -PLIST_SUB+= INNODB="@comment " -.endif -.if defined(WITH_XTRADB) -PLIST_SUB+= XTRADB="" -.else -CONFIGURE_ARGS+= --without-plugin-xtradb -PLIST_SUB+= XTRADB="@comment " -.endif -.if defined(WITH_OQGRAPH) -CONFIGURE_ARGS+= --with-plugin-oqgraph -PLIST_SUB+= OQGRAPH="" -LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs -.else -CONFIGURE_ARGS+= --without-plugin-oqgraph -PLIST_SUB+= OQGRAPH="@comment " -.endif -.if defined(WITH_PBXT) -CONFIGURE_ARGS+= --with-plugin-pbxt -PLIST_SUB+= PBXT="" -.else -CONFIGURE_ARGS+= --without-plugin-pbxt -PLIST_SUB+= PBXT="@comment " -.endif -.if defined(WITH_EXAMPLES) -PLIST_SUB+= EXAMPLES="" -.else -CONFIGURE_ARGS+= --without-plugin-example --without-plugin-daemon_example --without-plugin-ftexample -PLIST_SUB+= EXAMPLES="@comment " -.endif -.if defined(WITH_NDB) -CONFIGURE_ARGS+= --with-plugin-ndbcluster -WITH_PARTITION=yes -#MAN1+= ndb_config.1 ndb_delete_all.1 ndb_desc.1 ndb_drop_index.1 \ -# ndb_drop_table.1 ndb_error_reporter.1 ndb_mgm.1 \ -# ndb_print_backup_file.1 ndb_print_schema_file.1 \ -# ndb_print_sys_file.1 ndb_restore.1 ndb_select_all.1 \ -# ndb_select_count.1 ndb_show_tables.1 ndb_size.pl.1 ndb_waiter.1 -PLIST_SUB+= NDB="" -.else -CONFIGURE_ARGS+= --without-plugin-ndbcluster -PLIST_SUB+= NDB="@comment " -.endif -.if defined(WITH_PARTITION) -CONFIGURE_ARGS+= --with-plugin-partition -.else -CONFIGURE_ARGS+= --without-plugin-partition -.endif - -.if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" -CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET} -.endif -.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" -CONFIGURE_ARGS+= --with-extra-charsets=${WITH_XCHARSET} -.endif -.if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" -CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION} -.endif - -pre-fetch: - @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (def: latin1 selected: ${WITH_CHARSET})." - @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (selected: ${WITH_XCHARSET})." - @${ECHO} " WITH_COLLATION=collate Define default collation (def: latin1_swedish_ci selected: ${WITH_COLLATION})." - @${ECHO} "" - -post-patch: - @${REINPLACE_CMD} -e '/^install:/ s|^\(install:\).*$$|\1|' \ - ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in - -port-install: - @${CAT} pkg-message - -.include diff --git a/databases/mariadb/distinfo b/databases/mariadb/distinfo deleted file mode 100644 index 621b0937ac65..000000000000 --- a/databases/mariadb/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1 -SIZE (mariadb-5.2.5.tar.gz) = 24925585 diff --git a/databases/mariadb/files/mysql-server.in b/databases/mariadb/files/mysql-server.in deleted file mode 100644 index 37af2233ad55..000000000000 --- a/databases/mariadb/files/mysql-server.in +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} - -mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" -pidfile="${mysql_dbdir}/`/bin/hostname`.pid" -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${mysql_dbdir}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb/files/patch-extra::yassl::src::yassl_error.cpp b/databases/mariadb/files/patch-extra::yassl::src::yassl_error.cpp deleted file mode 100644 index 22f981de5570..000000000000 --- a/databases/mariadb/files/patch-extra::yassl::src::yassl_error.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- extra/yassl/src/yassl_error.cpp 2010-04-28 12:52:24 +0000 -+++ extra/yassl/src/yassl_error.cpp 2011-03-01 17:03:38 +0000 -@@ -128,7 +128,7 @@ - break; - - case badVersion_error : -- strncpy(buffer, "protocl version mismatch", max); -+ strncpy(buffer, "protocol version mismatch", max); - break; - - case compress_error : - - diff --git a/databases/mariadb/files/patch-sql::mysqld.cc b/databases/mariadb/files/patch-sql::mysqld.cc deleted file mode 100644 index b3eb0311e544..000000000000 --- a/databases/mariadb/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/mysqld.cc 2011-02-28 17:39:30 +0000 -+++ sql/mysqld.cc 2011-03-04 10:39:27 +0000 -@@ -744,9 +744,7 @@ - /* Static variables */ - - static bool kill_in_progress, segfaulted; --#ifdef HAVE_STACKTRACE - static my_bool opt_stack_trace; --#endif /* HAVE_STACKTRACE */ - static my_bool opt_bootstrap, opt_myisam_log; - static int cleanup_done; - static ulong opt_specialflag, opt_myisam_block_size; - - diff --git a/databases/mariadb/pkg-descr b/databases/mariadb/pkg-descr deleted file mode 100644 index 30b14a9f0075..000000000000 --- a/databases/mariadb/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -MariaDB is a database server that offers drop-in replacement functionality for -MySQL1. MariaDB is built by some of the original authors of MySQL, with -assistance from the broader community of Free and open source software -developers. In addition to the core functionality of MySQL, MariaDB offers a -rich set of feature enhancements including alternate storage engines, server -optimizations, and patches. - -MariaDB is primarily driven by developers at Monty Program, a company founded by -Michael "Monty" Widenius, the original author of MySQL, but this is not the -whole story about MariaDB. On the "About MariaDB" page you will find more -information about all participants in the MariaDB community, including storage -engines XtraDB and PBXT. - -WWW: http://mariadb.org/ diff --git a/databases/mariadb/pkg-message b/databases/mariadb/pkg-message deleted file mode 100644 index 4bfcf37dd75a..000000000000 --- a/databases/mariadb/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -MariaDB: you may want to activate plugins - some plugins (those in ${LOCALBASE}/lib/mysql/plugin/*.so) must be loaded in /my.cnf: - -[mysqld] -plugin-load=ha_xtradb.so:ha_federatedx.so diff --git a/databases/mariadb/pkg-plist b/databases/mariadb/pkg-plist deleted file mode 100644 index dd0c6971a5f9..000000000000 --- a/databases/mariadb/pkg-plist +++ /dev/null @@ -1,321 +0,0 @@ -%%ARIADB%%bin/aria_chk -%%ARIADB%%bin/aria_dump_log -%%ARIADB%%bin/aria_ftdump -%%ARIADB%%bin/aria_pack -%%ARIADB%%bin/aria_read_log -bin/innochecksum -bin/msql2mysql -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql -bin/mysql_client_test -bin/mysql_client_test_embedded -bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_fix_privilege_tables -bin/mysql_install_db -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -bin/mysql_waitpid -bin/mysql_zap -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlbug -bin/mysqlcheck -bin/mysqld_multi -bin/mysqld_safe -bin/mysqldump -bin/mysqldumpslow -bin/mysqlhotcopy -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest -bin/mysqltest_embedded -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -%%PBXT%%bin/xtstat -%%NDB%%bin/ndb_config -%%NDB%%bin/ndb_delete_all -%%NDB%%bin/ndb_desc -%%NDB%%bin/ndb_drop_index -%%NDB%%bin/ndb_drop_table -%%NDB%%bin/ndb_error_reporter -%%NDB%%bin/ndb_mgm -%%NDB%%bin/ndb_print_backup_file -%%NDB%%bin/ndb_print_schema_file -%%NDB%%bin/ndb_print_sys_file -%%NDB%%bin/ndb_restore -%%NDB%%bin/ndb_select_all -%%NDB%%bin/ndb_select_count -%%NDB%%bin/ndb_show_tables -%%NDB%%bin/ndb_size.pl -%%NDB%%bin/ndb_test_platform -%%NDB%%bin/ndb_waiter -include/evutil.h -include/event.h -include/event-config.h -include/mysql/client_plugin.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/keycache.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/my_alloc.h -include/mysql/my_attribute.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_no_pthread.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_valgrind.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h -include/mysql/plugin.h -include/mysql/plugin_auth.h -include/mysql/plugin_auth_common.h -include/mysql/readline.h -include/mysql/service_my_snprintf.h -include/mysql/service_thd_alloc.h -include/mysql/services.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h -%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h -%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h -%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h -%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h -%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -%%NDB%%include/mysql/storage/ndb/ndb_constants.h -%%NDB%%include/mysql/storage/ndb/ndb_init.h -%%NDB%%include/mysql/storage/ndb/ndb_types.h -%%NDB%%include/mysql/storage/ndb/ndb_version.h -%%ARIADB%%lib/mysql/libaria.a -lib/mysql/libdbug.a -lib/mysql/libheap.a -lib/mysql/libmyisam.a -lib/mysql/libmyisammrg.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.la -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.16 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.la -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.16 -lib/mysql/libmysqld.a -lib/mysql/libmysqld.la -lib/mysql/libmysqld.so -lib/mysql/libmysqld.so.0 -lib/mysql/libmysqlservices.a -lib/mysql/libmystrings.a -lib/mysql/libmysys.a -lib/mysql/libvio.a -lib/mysql/plugin/dialog.a -lib/mysql/plugin/dialog.la -lib/mysql/plugin/dialog.so -lib/mysql/plugin/dialog.so.0 -%%ARCHIVE%%lib/mysql/plugin/ha_archive.a -%%ARCHIVE%%lib/mysql/plugin/ha_archive.la -%%ARCHIVE%%lib/mysql/plugin/ha_archive.so -%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so -%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 -%%EXAMPLES%%lib/mysql/plugin/ha_example.a -%%EXAMPLES%%lib/mysql/plugin/ha_example.la -%%EXAMPLES%%lib/mysql/plugin/ha_example.so -%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 -%%FEDERATED%%lib/mysql/plugin/ha_federated.a -%%FEDERATED%%lib/mysql/plugin/ha_federated.la -%%FEDERATED%%lib/mysql/plugin/ha_federated.so -%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so -%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so -%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 -%%SPHINX%%lib/mysql/plugin/ha_sphinx.a -%%SPHINX%%lib/mysql/plugin/ha_sphinx.la -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 -%%XTRADB%%lib/mysql/plugin/ha_xtradb.a -%%XTRADB%%lib/mysql/plugin/ha_xtradb.la -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 -%%NDB%%lib/mysql/libndbclient.so.3 -%%NDB%%lib/mysql/libndbclient.so -%%NDB%%lib/mysql/libndbclient.la -%%NDB%%lib/mysql/libndbclient.a -%%EXAMPLES%%lib/mysql/plugin/mypluglib.a -%%EXAMPLES%%lib/mysql/plugin/mypluglib.la -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 -%%SPHINX%%lib/mysql/plugin/sphinx.a -%%SPHINX%%lib/mysql/plugin/sphinx.la -%%SPHINX%%lib/mysql/plugin/sphinx.so -%%SPHINX%%lib/mysql/plugin/sphinx.so.0 -libexec/mysqld -libexec/mysqlmanager -%%NDB%%libexec/ndb_cpcd -%%NDB%%libexec/ndb_mgmd -%%NDB%%libexec/ndbd -share/aclocal/mysql.m4 -%%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%%/config.huge.ini -%%DATADIR%%/config.medium.ini -%%DATADIR%%/config.small.ini -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg.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%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%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_fix_privilege_tables.sql -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/ndb-config-2-node.ini -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys -@dirrm %%DATADIR%%/ukrainian -@dirrm %%DATADIR%%/swedish -@dirrm %%DATADIR%%/spanish -@dirrm %%DATADIR%%/slovak -@dirrm %%DATADIR%%/serbian -@dirrm %%DATADIR%%/russian -@dirrm %%DATADIR%%/romanian -@dirrm %%DATADIR%%/portuguese -@dirrm %%DATADIR%%/polish -@dirrm %%DATADIR%%/norwegian-ny -@dirrm %%DATADIR%%/norwegian -@dirrm %%DATADIR%%/korean -@dirrm %%DATADIR%%/japanese -@dirrm %%DATADIR%%/italian -@dirrm %%DATADIR%%/hungarian -@dirrm %%DATADIR%%/greek -@dirrm %%DATADIR%%/german -@dirrm %%DATADIR%%/french -@dirrm %%DATADIR%%/estonian -@dirrm %%DATADIR%%/english -@dirrm %%DATADIR%%/dutch -@dirrm %%DATADIR%%/danish -@dirrm %%DATADIR%%/czech -@dirrm %%DATADIR%%/charsets -@dirrm %%DATADIR%% -@dirrm lib/mysql/plugin -@dirrm lib/mysql -%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi -%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi -%%NDB%%@dirrm include/mysql/storage/ndb -%%NDB%%@dirrm include/mysql/storage -@dirrm include/mysql