-Upgrade of mariadb to 5.2.5

-Fix pkg-plist

PR:		ports/156681
Submitted by:	Desvernay Geoffroy (dgeo@centrale-marseille.fr)(maintainer)
Approved by:	itetcu (mentor)(implicit)

6 files changed, 312 insertions, 58 deletions

diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 3399cdfde041..a959768bf2fe 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mariadb
-PORTVERSION=	5.2.4
+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/ \
@@ -18,13 +18,16 @@ MASTER_SITES=	http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION
 		http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
 
 MAINTAINER=	dgeo@centrale-marseille.fr
-COMMENT=	A database server that offers drop-in replacement functionality for MySQL
-
+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
 
-CONFLICTS=	mysql-server-[0-9]* mysql-client-[0-9]*
+CPPFLAGS+=	-I${LOCALBASE}/include
 
-CONFIGURE_ARGS=	--with-embedded-server
 DATADIR=	${PREFIX}/share/mysql
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/mysql
@@ -83,8 +86,161 @@ MAN1=		comp_err.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 <bsd.port.options.mk>
+
+.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 <bsd.port.mk>
diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo
index c80d536b065a..621b0937ac65 100644
--- a/databases/mariadb-server/distinfo
+++ b/databases/mariadb-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.2.4.tar.gz) = 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc
-SIZE (mariadb-5.2.4.tar.gz) = 24964617
+SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
+SIZE (mariadb-5.2.5.tar.gz) = 24925585
diff --git a/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp b/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp
new file mode 100644
index 000000000000..22f981de5570
--- /dev/null
+++ b/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp
@@ -0,0 +1,13 @@
+--- 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-server/files/patch-sql::mysqld.cc b/databases/mariadb-server/files/patch-sql::mysqld.cc
new file mode 100644
index 000000000000..b3eb0311e544
--- /dev/null
+++ b/databases/mariadb-server/files/patch-sql::mysqld.cc
@@ -0,0 +1,14 @@
+--- 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-server/pkg-message b/databases/mariadb-server/pkg-message
new file mode 100644
index 000000000000..4bfcf37dd75a
--- /dev/null
+++ b/databases/mariadb-server/pkg-message
@@ -0,0 +1,5 @@
+MariaDB: you may want to activate plugins
+  some plugins (those in ${LOCALBASE}/lib/mysql/plugin/*.so) must be loaded in <datadir>/my.cnf:
+
+[mysqld]
+plugin-load=ha_xtradb.so:ha_federatedx.so
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index 4ef7adf156a9..dd0c6971a5f9 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -1,8 +1,8 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
+%%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
@@ -44,6 +44,27 @@ 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
@@ -85,7 +106,38 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-lib/mysql/libaria.a
+%%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
@@ -110,52 +162,62 @@ lib/mysql/plugin/dialog.a
 lib/mysql/plugin/dialog.la
 lib/mysql/plugin/dialog.so
 lib/mysql/plugin/dialog.so.0
-lib/mysql/plugin/ha_archive.a
-lib/mysql/plugin/ha_archive.la
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_archive.so.0
-lib/mysql/plugin/ha_blackhole.a
-lib/mysql/plugin/ha_blackhole.la
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_blackhole.so.0
-lib/mysql/plugin/ha_example.a
-lib/mysql/plugin/ha_example.la
-lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/ha_example.so.0
-lib/mysql/plugin/ha_federated.a
-lib/mysql/plugin/ha_federated.la
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federated.so.0
-lib/mysql/plugin/ha_federatedx.a
-lib/mysql/plugin/ha_federatedx.la
-lib/mysql/plugin/ha_federatedx.so
-lib/mysql/plugin/ha_federatedx.so.0
-lib/mysql/plugin/ha_innodb_plugin.a
-lib/mysql/plugin/ha_innodb_plugin.la
-lib/mysql/plugin/ha_innodb_plugin.so
-lib/mysql/plugin/ha_innodb_plugin.so.0
-lib/mysql/plugin/ha_sphinx.a
-lib/mysql/plugin/ha_sphinx.la
-lib/mysql/plugin/ha_sphinx.so
-lib/mysql/plugin/ha_sphinx.so.0
-lib/mysql/plugin/ha_xtradb.a
-lib/mysql/plugin/ha_xtradb.la
-lib/mysql/plugin/ha_xtradb.so
-lib/mysql/plugin/ha_xtradb.so.0
-lib/mysql/plugin/libdaemon_example.a
-lib/mysql/plugin/libdaemon_example.la
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libdaemon_example.so.0
-lib/mysql/plugin/mypluglib.a
-lib/mysql/plugin/mypluglib.la
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mypluglib.so.0
-lib/mysql/plugin/sphinx.a
-lib/mysql/plugin/sphinx.la
-lib/mysql/plugin/sphinx.so
-lib/mysql/plugin/sphinx.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
@@ -252,4 +314,8 @@ share/aclocal/mysql.m4
 @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