- Update to 5.3.7

PR:		ports/168351
Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer)

3 files changed, 321 insertions, 167 deletions

diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index a0db4ef21159..704ae58727aa 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PORTVERSION=	5.3.6
+PORTVERSION=	5.3.7
 PORTREVISION?=	0
 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/ \
+MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo
index 998ef5fe0081..2025bf6355b1 100644
--- a/databases/mariadb-server/distinfo
+++ b/databases/mariadb-server/distinfo
@@ -1,2 +1,2 @@
-SIZE (mariadb-5.3.6.tar.gz) = 26724631
-SHA256 (mariadb-5.3.6.tar.gz) = 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
+SIZE (mariadb-5.3.7.tar.gz) = 26741196
+SHA256 (mariadb-5.3.7.tar.gz) = 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index c00213307ba6..b02823567cd7 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -1,15 +1,8 @@
-%%ARIADB%%bin/aria_chk
-%%ARIADB%%bin/aria_dump_log
-%%ARIADB%%bin/aria_ftdump
-%%ARIADB%%bin/aria_pack
-%%ARIADB%%bin/aria_read_log
-%%XTRADB%%bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-%%HANDLERSOCKET%%bin/hsclient
 bin/mysql_client_test_embedded
 bin/mysql_convert_table_format
 bin/mysql_find_rows
@@ -26,6 +19,107 @@ bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mysqltest_embedded
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+%%ARIADB%%bin/aria_chk
+%%ARIADB%%bin/aria_dump_log
+%%ARIADB%%bin/aria_ftdump
+%%ARIADB%%bin/aria_pack
+%%ARIADB%%bin/aria_read_log
+%%ARIADB%%lib/mysql/libaria.a
+%%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_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
+%%HANDLERSOCKET%%bin/hsclient
+%%HANDLERSOCKET%%include/handlersocket/allocator.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp
+%%HANDLERSOCKET%%include/handlersocket/config.hpp
+%%HANDLERSOCKET%%include/handlersocket/escape.hpp
+%%HANDLERSOCKET%%include/handlersocket/fatal.hpp
+%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp
+%%HANDLERSOCKET%%include/handlersocket/mutex.hpp
+%%HANDLERSOCKET%%include/handlersocket/socket.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_util.hpp
+%%HANDLERSOCKET%%include/handlersocket/thread.hpp
+%%HANDLERSOCKET%%include/handlersocket/util.hpp
+%%HANDLERSOCKET%%lib/libhsclient.a
+%%HANDLERSOCKET%%lib/libhsclient.la
+%%HANDLERSOCKET%%lib/libhsclient.so
+%%HANDLERSOCKET%%lib/libhsclient.so.0
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.la
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0
 %%NDB%%bin/ndb_config
 %%NDB%%bin/ndb_delete_all
 %%NDB%%bin/ndb_desc
@@ -43,27 +137,6 @@ bin/mysqltest_embedded
 %%NDB%%bin/ndb_size.pl
 %%NDB%%bin/ndb_test_platform
 %%NDB%%bin/ndb_waiter
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%PBXT%%bin/xtstat
-%%HANDLERSOCKET%%include/handlersocket/allocator.hpp
-%%HANDLERSOCKET%%include/handlersocket/config.hpp
-%%HANDLERSOCKET%%include/handlersocket/mutex.hpp
-%%HANDLERSOCKET%%include/handlersocket/string_util.hpp
-%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp
-%%HANDLERSOCKET%%include/handlersocket/escape.hpp
-%%HANDLERSOCKET%%include/handlersocket/socket.hpp
-%%HANDLERSOCKET%%include/handlersocket/thread.hpp
-%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp
-%%HANDLERSOCKET%%include/handlersocket/fatal.hpp
-%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp
-%%HANDLERSOCKET%%include/handlersocket/util.hpp
-%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp
-%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp
-%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp
-%%HANDLERSOCKET%%@dirrm include/handlersocket
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
@@ -95,41 +168,21 @@ bin/resolveip
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
-%%ARIADB%%lib/mysql/libaria.a
-%%HANDLERSOCKET%%lib/libhsclient.so.0
-%%HANDLERSOCKET%%lib/libhsclient.so
-%%HANDLERSOCKET%%lib/libhsclient.la
-%%HANDLERSOCKET%%lib/libhsclient.a
-lib/mysql/libdbug.a
-lib/mysql/libheap.a
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
-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
 %%NDB%%lib/mysql/libndbclient.a
 %%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
-lib/mysql/libvio.a
-%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0
-%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so
-%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.la
-%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a
-%%STATIC%%lib/mysql/plugin/auth_pam.la
-%%STATIC%%lib/mysql/plugin/auth_pam.so
-%%STATIC%%lib/mysql/plugin/auth_pam.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%%lib/mysql/plugin/feedback.la
-%%STATIC%%lib/mysql/plugin/feedback.so
-%%STATIC%%lib/mysql/plugin/feedback.so.0
+%%NDB%%libexec/ndb_cpcd
+%%NDB%%libexec/ndb_mgmd
+%%NDB%%libexec/ndbd
+%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la
+%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
+%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0
+%%PBXT%%bin/xtstat
+%%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
 %%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
@@ -159,120 +212,222 @@ lib/mysql/libvio.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
 %%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
 %%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
+%%STATIC%%lib/mysql/plugin/auth_pam.la
+%%STATIC%%lib/mysql/plugin/auth_pam.so
+%%STATIC%%lib/mysql/plugin/auth_pam.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%%lib/mysql/plugin/feedback.la
+%%STATIC%%lib/mysql/plugin/feedback.so
+%%STATIC%%lib/mysql/plugin/feedback.so.0
+%%XTRADB%%bin/innochecksum
+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/x86-gcc.h
+include/mysql/private/authors.h
+include/mysql/private/base64.h
+include/mysql/private/client_settings.h
+include/mysql/private/config-netware.h
+include/mysql/private/config-win.h
+include/mysql/private/contributors.h
+include/mysql/private/create_options.h
+include/mysql/private/debug_sync.h
+include/mysql/private/event_data_objects.h
+include/mysql/private/event_db_repository.h
+include/mysql/private/event_parse_data.h
+include/mysql/private/event_queue.h
+include/mysql/private/event_scheduler.h
+include/mysql/private/events.h
+include/mysql/private/field.h
+include/mysql/private/ft_global.h
+include/mysql/private/gcalc_slicescan.h
+include/mysql/private/gcalc_tools.h
+include/mysql/private/gstream.h
+include/mysql/private/ha_ndbcluster.h
+include/mysql/private/ha_ndbcluster_binlog.h
+include/mysql/private/ha_ndbcluster_cond.h
+include/mysql/private/ha_ndbcluster_tables.h
+include/mysql/private/ha_partition.h
+include/mysql/private/handler.h
+include/mysql/private/hash.h
+include/mysql/private/hash_filo.h
+include/mysql/private/heap.h
+include/mysql/private/help_end.h
+include/mysql/private/help_start.h
+include/mysql/private/item.h
+include/mysql/private/item_cmpfunc.h
+include/mysql/private/item_create.h
+include/mysql/private/item_func.h
+include/mysql/private/item_geofunc.h
+include/mysql/private/item_row.h
+include/mysql/private/item_strfunc.h
+include/mysql/private/item_subselect.h
+include/mysql/private/item_sum.h
+include/mysql/private/item_timefunc.h
+include/mysql/private/item_xmlfunc.h
+include/mysql/private/lex.h
+include/mysql/private/lex_symbol.h
+include/mysql/private/lf.h
+include/mysql/private/log.h
+include/mysql/private/log_event.h
+include/mysql/private/log_event_old.h
+include/mysql/private/log_slow.h
+include/mysql/private/maria.h
+include/mysql/private/multi_range_read.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_compare.h
+include/mysql/private/my_decimal.h
+include/mysql/private/my_handler.h
+include/mysql/private/my_libwrap.h
+include/mysql/private/my_md5.h
+include/mysql/private/my_nosys.h
+include/mysql/private/my_regex.h
+include/mysql/private/my_stacktrace.h
+include/mysql/private/my_time.h
+include/mysql/private/my_tree.h
+include/mysql/private/my_trie.h
+include/mysql/private/my_uctype.h
+include/mysql/private/my_user.h
+include/mysql/private/my_vle.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_priv.h
+include/mysql/private/mysqld_suffix.h
+include/mysql/private/mysys_err.h
+include/mysql/private/opt_range.h
+include/mysql/private/opt_subselect.h
+include/mysql/private/parse_file.h
+include/mysql/private/partition_element.h
+include/mysql/private/partition_info.h
+include/mysql/private/plistsort.c
+include/mysql/private/procedure.h
+include/mysql/private/protocol.h
+include/mysql/private/queues.h
+include/mysql/private/rijndael.h
+include/mysql/private/rpl_constants.h
+include/mysql/private/rpl_filter.h
+include/mysql/private/rpl_injector.h
+include/mysql/private/rpl_mi.h
+include/mysql/private/rpl_record.h
+include/mysql/private/rpl_record_old.h
+include/mysql/private/rpl_reporting.h
+include/mysql/private/rpl_rli.h
+include/mysql/private/rpl_tblmap.h
+include/mysql/private/rpl_utility.h
+include/mysql/private/scheduler.h
+include/mysql/private/service_versions.h
+include/mysql/private/set_var.h
+include/mysql/private/sha1.h
+include/mysql/private/slave.h
+include/mysql/private/sp.h
+include/mysql/private/sp_cache.h
+include/mysql/private/sp_head.h
+include/mysql/private/sp_pcontext.h
+include/mysql/private/sp_rcontext.h
+include/mysql/private/spatial.h
+include/mysql/private/sql_acl.h
+include/mysql/private/sql_array.h
+include/mysql/private/sql_bitmap.h
+include/mysql/private/sql_cache.h
+include/mysql/private/sql_class.h
+include/mysql/private/sql_crypt.h
+include/mysql/private/sql_cursor.h
+include/mysql/private/sql_error.h
+include/mysql/private/sql_expression_cache.h
+include/mysql/private/sql_handler.h
+include/mysql/private/sql_join_cache.h
+include/mysql/private/sql_lex.h
+include/mysql/private/sql_lifo_buffer.h
+include/mysql/private/sql_list.h
+include/mysql/private/sql_map.h
+include/mysql/private/sql_partition.h
+include/mysql/private/sql_plugin.h
+include/mysql/private/sql_plugin_services.h
+include/mysql/private/sql_profile.h
+include/mysql/private/sql_repl.h
+include/mysql/private/sql_select.h
+include/mysql/private/sql_servers.h
+include/mysql/private/sql_show.h
+include/mysql/private/sql_sort.h
+include/mysql/private/sql_string.h
+include/mysql/private/sql_trigger.h
+include/mysql/private/sql_udf.h
+include/mysql/private/sql_view.h
+include/mysql/private/structs.h
+include/mysql/private/t_ctype.h
+include/mysql/private/table.h
+include/mysql/private/thr_alarm.h
+include/mysql/private/thr_lock.h
+include/mysql/private/tzfile.h
+include/mysql/private/tztime.h
+include/mysql/private/unireg.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/libdbug.a
+lib/mysql/libheap.a
+lib/mysql/libmyisam.a
+lib/mysql/libmyisammrg.a
+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
 libexec/mysqld
-%%NDB%%libexec/ndb_cpcd
-%%NDB%%libexec/ndb_mgmd
-%%NDB%%libexec/ndbd
-%%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_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%%/charsets
-@dirrm %%DATADIR%%/czech
-@dirrm %%DATADIR%%/danish
-@dirrm %%DATADIR%%/dutch
-@dirrm %%DATADIR%%/english
-@dirrm %%DATADIR%%/estonian
-@dirrm %%DATADIR%%/french
-@dirrm %%DATADIR%%/german
-@dirrm %%DATADIR%%/greek
-@dirrm %%DATADIR%%/hungarian
-@dirrm %%DATADIR%%/italian
-@dirrm %%DATADIR%%/japanese
-@dirrm %%DATADIR%%/korean
-@dirrm %%DATADIR%%/norwegian
-@dirrm %%DATADIR%%/norwegian-ny
-@dirrm %%DATADIR%%/polish
-@dirrm %%DATADIR%%/portuguese
-@dirrm %%DATADIR%%/romanian
-@dirrm %%DATADIR%%/russian
-@dirrm %%DATADIR%%/serbian
-@dirrm %%DATADIR%%/slovak
-@dirrm %%DATADIR%%/spanish
-@dirrm %%DATADIR%%/swedish
 @dirrm %%DATADIR%%/ukrainian
-@dirrmtry %%DATADIR%%
-%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
+@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%%
 %%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
+%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
-@dirrmtry include/mysql
+%%HANDLERSOCKET%%@dirrm include/handlersocket
 @dirrmtry lib/mysql/plugin
 @dirrmtry lib/mysql
+@dirrmtry include/mysql/private/atomic
+@dirrmtry include/mysql/private
+@dirrmtry include/mysql