Add new 5.6 configs to better match upstream wrt bug 524768

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

12 files changed, 636 insertions, 36 deletions

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 64d8bbced647..c050430a74eb 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mariadb-galera
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.6 2014/10/06 17:44:30 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.7 2014/10/08 16:42:06 grknight Exp $
+
+  08 Oct 2014;  <grknight@gentoo.org> +files/my.cnf-5.6:
+  Add new 5.6 configs to better match upstream wrt bug 524768
 
   06 Oct 2014;  <grknight@gentoo.org> mariadb-galera-10.0.13.ebuild:
   Restore die that was taken out by accident
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 931ef91f6bb8..7be24e5a44ac 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX my.cnf-5.5 5358 SHA256 c282f0545addccf14ca8f983eb26cba38af27177b7785ab20e6ae1af0930f7fc SHA512 82eb974309ddb0cbab5ec9f8e6699181efcd6e67dddb59ce9d98301c3f041276cdd813bdb3a8e7244fcb65f6f55ae587341789180430e6508cbff57e6cf92d3d WHIRLPOOL 0eb6d850b970c1eddbcee4543ca87baee18f08347b308cfcb69168f60c1fc4127a492135b75db03f7bf94490f908cbf38df3bc0cd8560a5de5a058a3f3d09125
+AUX my.cnf-5.6 5259 SHA256 ce22f1829abad1770614b161ad86a01007458f1080332aaa9f1ed9c4fb526705 SHA512 565e638ed41d9706dc1294a558e0e5bf7e576bfc6ca097ed016e142e0010bfceafe6ea56403408496a6acecf833410881284b1233dec15b15f86f1abf4c9cbfb WHIRLPOOL bd0d85adf51a0acc8ef2f04305ae61a2242a3a20c66f5a44a1d98cc75ed429a1d8aabebe1b64fae948ecb66d68029fab410f047ab82d213cca95ad8b8dfb2be2
 DIST mariadb-galera-10.0.12.tar.gz 51307785 SHA256 e68d6ec7c99e0c361a1d2e986e4adb2436776de8192e39dc9ea08ef24e13b1ef SHA512 8c6a39d3a81a7ea795a1c55e527c85996b4dc227607722e94d3c13051e19109bb9873b9993279407064f1d9dc0d1585234af5d22d9d1940fc05b856076249504 WHIRLPOOL 2d2a2720a5b5289902254549b06dd4cbb1476ad76b6bb2bef2fbd7ae57cb8490a47a0b260507ff93ef5aa647a270d2de48f0fb7a3a9ef8dcfea059734362db7d
 DIST mariadb-galera-10.0.13.tar.gz 51542182 SHA256 9302c5ca8447e4f33e6f043dbdf56ec0028e1da8dfb713b9f1a81b1d6cd8d2fd SHA512 0274a344ef7da7f663f5822fcd5caa2672e4464e05d06c924050b9f7aaa34c0016067c9dda1f46697519d1eb6b80492f3ac2c7bbb86b0148735fd519b9eb1125 WHIRLPOOL df9c3e1a8fde111f5b1b66d9f556ab4a1b57c42cafd21dabc3a93d8de3add7b46f7f267f17110f19355018c5d2ebc97a8b75a5117106352137a5fdda67fde111
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
 DIST mysql-extras-20140903-1928Z.tar.bz2 1494599 SHA256 3a1e4ba87b301751f1964875bdba4c4baafe270267247ee79e4285e256f272f8 SHA512 2fcf08cca2ccf62533058e1994a8aca1ffc17867495d5c7fe588d42978e9c5c2e08f93991f44b0354818db14339a09b156471a7c428de17250c54f48c5aca7c4 WHIRLPOOL fc5983a0cb3c8a8faabdb2b8f8cba183188b5cfa2e40eda0207942ed92cf69675ca1753b7c35420c5b0882d4b77d1daacf586fb08f5cb5c701b7925e549cd2c8
 EBUILD mariadb-galera-10.0.12.ebuild 4003 SHA256 ee0c17a8d17822ad3b8eb8b197a6ab3a86609737115ca3abc373f2fb7dc817ae SHA512 97d67576e5e9b40eb795020b2ac19443557519a7e924d0ca5db312728a5d4e324fa60fd4d78db40b567b2577bbae65de57a5424f52ef4a9a83c60819ec3341af WHIRLPOOL 5ffe5bb3d1a9250dba49a07a29d100c25cbd0282698d0b2c39c94e9c59e4f6221d3b6e7051a8db0deb8d927333111c199f955693e62e6bb5fd2b0c17b05aee46
 EBUILD mariadb-galera-10.0.13.ebuild 4239 SHA256 59b0e2a2475f9cb24d99f68f5b0df8a7d36ba816af4a96b50c733b1ccdac6779 SHA512 04dc31cfde10e2f8e8572ad40298805da3f9b3098e36d8432a228fcd7aa1bb310252ccbbae7a9fbad13d8bddf35c861ac096b83981cc9dda4b77a1f6fdee2e9a WHIRLPOOL 4adc7860df00bea4e6154988da7337d484e716cec70afc0389eab95f2908f6e405179a760e9f95c50f9b64230bb08c63ed317a404a7b5b4bd9765fdf4e4c8a71
-MISC ChangeLog 1122 SHA256 5830deed83fe668528fe804b75642caf6a1fe04c9d7ccfc2069431def371197b SHA512 476643e1e0688dffb5837579de754f784a5e1239663402382e851f9c9431248601bf686c7791a915fd9fc04b8eb834cd76da5a3cf404549fd11186d9befeeb5a WHIRLPOOL 3b550b412dbc6feff1a248009c3e805e2e820bb06ffed5504601e1b9181d59dc80d40ff76f47cc1765caefd8ea8db70cccd658b2cc095a301c0db1e0372abc25
+MISC ChangeLog 1242 SHA256 ecb96f24b98daa31f3839169013bacbf09329ffe24258c33e8de3f4047c2d077 SHA512 29d03a9b60c7e8f0e49f4cdd7b85077d802ea30aa629b513f5c5cef60222a493262b1cefc616ae99b953d06cb4e525db1cbca32457625ff9caa0e44ca62f597f WHIRLPOOL cc72cd436feca06b3a491e49b129f6eccda711934eb9802fc3450b00c89c8f6d0c6b1fe4d84a640c3a13019abefd952d6f11febd56e2cb677cb2183252ec9676
 MISC metadata.xml 1606 SHA256 2a7f23fcb98dbc719cf012e28d8309dcb8c746d3ab250693dbaad9230b676d4a SHA512 faf8ed70e620e2aca93c5da296b0dcac4bd412913e4d356ad5cb8e89bdf057fba4b0cc6f273d5f4fc9f75080773c2e240e273b0d49d92796708ffcb871f957c6 WHIRLPOOL 365d8e09f4fa80bdc79e555fcdf3cda4a03fa28f764bc4a64d8286ec76512d112c89b63311d94cbb39f0fd36dd05c4ad9ea0e161938152fac97528a8f9495b9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUMtT/AAoJEE4V4vFnx44dFwcH/Ry5VsjjDdLQ8NEUwcxEMwBG
-RLfGq/bFCDFJhHaLjHWDG7jP17xRoKnDeoqxyk2bG6w0vJhPFm2hA0jYz0Ckg76L
-e/BDKqOkd91rrCCHDXU4OGoEdQDWhqoaXB9a6FEyjx7iFJ9QPZwT/jO+VlLgLmdf
-Ch2u91x5RuafqMh202uXjME92UTUL64hjKTTMQN7Y4FdxNKPIoJ/RAN9ayD/cMS9
-gmOXahnEgbv4TNmith+Hufy/4pMF6nCNc9hm7ZX/KLmMj7El8MgREoTNZ9FCNham
-hZGb8XdR0YXApMUpCVAoLmIbwYaG5O1rOONzZttgi/ZXrv5kZ7A8F/lKBZ/JnY4=
-=osV5
+iQEcBAEBCAAGBQJUNWlfAAoJEE4V4vFnx44dvUoH/3EHzYo642gDtkZunt6TwdIG
+tGDJQwrRgVU10SHlHAWsC4EkIHQOxj0H98XWOQkY15cV5POx53tot65EvNrjY0zr
+uIuG6ifnIJ5sOHPfNQj2gNbGvPzQKYmibdqs691+m1wIzMWFgEqxLvThG7UN3dt/
+/9ALTchGAF6pQnNdeCBmmcp5EQkpBJhKs2zoUJxvmI0V+5HZTad3PAM7IkR9NH1C
+PX07HC8nt1N97muLk4UKh/Y3B6HP9IM2cew5Y3afT4sOGVCHQMmh/mcwv3eem83x
+IjEJDMI/F/YJCYSzeg12FoA/m+kCRccHm+F0Rcciyeflp/yGdLq6W7Xx7DTRKBU=
+=Hx1E
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/files/my.cnf-5.6 b/dev-db/mariadb-galera/files/my.cnf-5.6
new file mode 100644
index 000000000000..3464ecc2ee64
--- /dev/null
+++ b/dev-db/mariadb-galera/files/my.cnf-5.6
@@ -0,0 +1,159 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/files/my.cnf-5.6,v 1.1 2014/10/08 16:42:06 grknight Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 4M
+table_open_cache 			= 400
+sort_buffer_size 			= 512K
+net_buffer_length 			= 16K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+# These settings are required for Galera clustering
+#mysql settings
+binlog_format=ROW
+default-storage-engine=innodb
+innodb_autoinc_lock_mode=2
+query_cache_size=0
+query_cache_type=0
+bind-address=0.0.0.0
+# Uncomment this section to activate Galera clustering
+#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
+# You should change this name to something meaningful
+#wsrep_cluster_name="my_wsrep_cluster"
+# List all nodes of the cluster including this one
+#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
+#wsrep_sst_method=rsync
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+[mariadb]
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 8e3b55d29c40..5b23dc2b7ca5 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.55 2014/10/06 17:28:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.56 2014/10/08 16:41:46 grknight Exp $
+
+  08 Oct 2014;  <grknight@gentoo.org> +files/my.cnf-5.6:
+  Add new 5.6 configs to better match upstream wrt bug 524768
 
   06 Oct 2014;  <grknight@gentoo.org> mariadb-10.0.14.ebuild,
   mariadb-5.5.39.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 93285a579206..f81c55b894d6 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX my.cnf-5.1 4829 SHA256 109d4db271860f646df0a1317a2812ffe4b51785aca423bf539e93de2640b65f SHA512 7b0838ac416dffc184a92720991ec78daf2bdb1056cf9b24d918002458ae8693a8b9d91280bb754ce9fb12b0f861f111a134909a545260304401161a53827747 WHIRLPOOL b628a658ad842353b63975081548761a0f41c357e5f1089147286edee57ea6e274b25af5a3aa339b058aaf6da5d306153e465ca42b9e14d2a2399f4cd2280750
 AUX my.cnf-5.5 4916 SHA256 b579073c015719b9623e2e00a985587947bb3562958f6e6f555306021b56d1e6 SHA512 93a79e4807d7fc6cb196445fa885c334ca86981513a0b716bf39f3bca76a7cdfeb62044bae7c44943c683e698a5fc4afe9a8d92fd1d03fce57531abd1947fb68 WHIRLPOOL 05dbc74ade9943d3752e2123449802ec8f5f743aaf0280325c8512f85aca0c3e70acae2eef0f4d1edfb5fde2891a58cf58e6deb3d1f9b0adc1e0c7597ee98607
+AUX my.cnf-5.6 4687 SHA256 dc94a99e91d082b47c0ceb10badbf12a44c5ab7f60710bcc2e5f136328856d05 SHA512 8e568f6002a1bef3be73e6e0811fd2479c0611fe8f55175e114d622860801429ebfafd6fcff7c9f38679185fc660b100d24fe599b0424cc73e776bf5c0aeb3a3 WHIRLPOOL b5800fb149a99582f4866079946ba744efda79abbffcea2db495566daab03e6a55f7df1adf63f11c43c240ba5c1df64fea233f60481d27430729011563afe209
 DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
 DIST mariadb-10.0.14.tar.gz 51156364 SHA256 ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d SHA512 9bb4466f4a71dd85e5811c3117208a6687815b60075beca341c281f5f919b7d6007d2c706f6916d135c7d1d4b02d57f7afb4d97cfac36a61195d994f8a269f17 WHIRLPOOL 3b1e76bc2f3f668bb73cc4159fc09d1757cb32555ea5a0e40a12112cdf101d0be01d93384e4e28a5247f1ea6e0811ed0582325bcd2e37f253cf79fe2d195ee35
 DIST mariadb-5.5.39.tar.gz 45084762 SHA256 cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14 SHA512 a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67 WHIRLPOOL d1c3efdb2ff4de1830e8d5f03709b7c7a1e037a07902fce3253473a241b62f15b3ccb54896e4ca048ecd952acc84577cfc0788632a2c4aa77694f86fe48f1089
@@ -12,16 +13,16 @@ DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256 958114bbe5fe21220f27b478
 EBUILD mariadb-10.0.12.ebuild 3941 SHA256 4b8cf5c1a4b72377f5a933ff610233ad34da98d4acd6153a97bfeaf3b74a27b6 SHA512 04b7e448d28ba7282c70f6264904acbdd8d7cb29969bec0fa97b78b33dfd85a25069393c64a16658ea7a714384ff2588b2e48da36ab83926588e65e82e9824ac WHIRLPOOL 3ddbcb7acd924d4e7ac713f44fbe4c61599399b7ccdac93a5ac060379b290dc2c2535e47bc4309d7ee7fdcb4b1bd6ea455ce1eccef4241e9fa377767d44b0e09
 EBUILD mariadb-10.0.14.ebuild 3961 SHA256 fe748747cbfdfceefb74150a1e48164669ec07589d61d11b0eb75955559a023b SHA512 e3bdef97ec5f54bd2471e62960228933a5c19fbde0d0326f586b2326ed3793dee6cf892f6d5b17f15f9925339158d186080839f16c1f7a4227484b03cf3b07fd WHIRLPOOL a3bb18d10a297ff2c8da10980c2b7c62018778ba7589413adb7f3d7098be9f79242d0ab4d827928062fb3faf144aa9fb3bc47d6228071e002eaf3a6e10e69ffa
 EBUILD mariadb-5.5.39.ebuild 3929 SHA256 efe94a248bf2b54429ab492f9d85c811676785a87fb0f291992f03278e8752c0 SHA512 16fe762c96bec6f60238539349e5f932814851918f0eaa8423c75386845a6211024e007978099f102bbe848e5b3e0f7dca7161a335294e498aa902f2fec0f6ca WHIRLPOOL c66df1b41774a19d98811a8e8b3b453029f1bc66c95f178ff2df289d2852cb0b74cdc975041f33a01fd18cc51270ccd60482e13ac748a8a8adf6fb4844f3d329
-MISC ChangeLog 10603 SHA256 6159b10faa1f8788bb2c521abe79ce7f7a9784e4c7fc180b0c7ff94554460cd6 SHA512 485c1666db150b4091671536752cb9120b594a4fa6e3254d42729c39c7ca8327d72d168eac48b1f9228c5a4ee3917e44e3fed355f21305edd9cfce65a7db31c9 WHIRLPOOL 4c6fc157feba6c02082b2bc1276580027f29fa1cd5125d33df28dbc7998af511f42b8f0b79dbf4518e40677981841e7c154157f3b3211ef775f1cb6d1cc9497c
+MISC ChangeLog 10723 SHA256 5a4b5272d3d8344995aeb5388423d6e0a19bafc4c87ae91236f1188d1a80d44e SHA512 7f6c81a65193fef5e93bf1f4dd69454dd9e5819111530d710fc29ea4f53a94532c32a95db9b0c46cf75066cb86f56ca4f7d2a6bfd948737f3666695c44ce5da9 WHIRLPOOL 482eb3b8284587ef6c49badc620887089cb0b75af80186c47ec1091b604409fa6fc6ee5e26595d7d093021382e7981f20e22be07ed9c5e0eaab59a492d720e3f
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUMtFKAAoJEE4V4vFnx44duJAIAJrNKZ2WVd6Yla61Dl6k8l7D
-cCjF41HTpstRhExJmY9SpKowYRXWXAQA4Rznbc3T2RaiFh03wHMUu2K3+vsWPDt7
-SDPgU2OJXikqKvGlgdZEJDfEerNZv1mvQ54mxcDm/o6opyciWie0hpGciMkV6XO8
-nPkwISY6nE5ObyNrlwFzV2NvpYP8CkyIDeVDVgBljFEB41fkuOyyvvdqeB3seaUQ
-2EOfmdcReUnObEsBZ90Gelx7FqEeEXg3NqFHt1KgrexxvAXx1Ux6Jb0V5vNyYObV
-SDcumvfzV4vG2OlZxpV4VHFaCrFoNye1fSRLRm2rFAHPcbu4Z/d/TRfAU+OXs+I=
-=viB0
+iQEcBAEBCAAGBQJUNWlLAAoJEE4V4vFnx44dw1sIAKa7Dr5CNOFAk2xHQXNwOIOX
+7bMqWBKB+NoEjev6tzHYl7LPiItaZxp2dgIdAhpzN+wOW7HIazKadpNano0H+U6n
+ll8s6u2gSj/43ReOl8pm3/5fThJUhCsXIg5frc0grDBYJtDj+xfM+WyI/bF0mECJ
+0V4+jk2952zcQmUbK0R9iqWkUCV+2SdsT1xnL5ywwe3lM6Q/GWUX9d7KbpPq7K32
+3pnMjGvaWpkvx5XP9IZUYGT7QZxH5yv3MUBpGGNh6yBwZaSz51jTLJV8BAbyXBlt
+eJd06MEdx/kitKuskypskjH/8odCBUn7ONfLXhJDiYfZpKJ59D4hIUQuSFqZERM=
+=ilUM
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/files/my.cnf-5.6 b/dev-db/mariadb/files/my.cnf-5.6
new file mode 100644
index 000000000000..2009ed3c81a8
--- /dev/null
+++ b/dev-db/mariadb/files/my.cnf-5.6
@@ -0,0 +1,143 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.6,v 1.1 2014/10/08 16:41:46 grknight Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 4M
+table_open_cache 			= 400
+sort_buffer_size 			= 512K
+net_buffer_length 			= 16K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+[mariadb]
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d1cd8806ac5a..deda8dc36678 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.693 2014/10/06 17:35:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.694 2014/10/08 16:42:42 grknight Exp $
+
+  08 Oct 2014;  <grknight@gentoo.org> +files/my.cnf-5.6:
+  Add new 5.6 configs to better match upstream wrt bug 524768
 
   06 Oct 2014;  <grknight@gentoo.org> mysql-5.5.39.ebuild, mysql-5.5.40.ebuild,
   mysql-5.6.21.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4375db616a68..a9b1ada7f459 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
 AUX my.cnf-5.5 4903 SHA256 5dea40a071aa24d34485788fcf5a852885f362f69dfa1e479d813386c1c08d8b SHA512 caa701bfb912d32d0e0d61e28c59b9e106c0ca2c6717d79365bca8f67fda69c705a36fe56cb00e3e76bfbb8eb099e0a74f900dc3546f88004247706a3ac3b01f WHIRLPOOL ea276746aa54cf9659a0c81d2c978d0ac880bb0d0b86ffaf9c4a8a5f0d250d1c1736669fc1ec250b0f702f3b3095256d0310e146ad67ecdbf4ebf61eba282add
+AUX my.cnf-5.6 4674 SHA256 c7eb9b67e6dc0006dc10bc3b0a4ade611fc1d05e50c7469d5e1d177f3fcdb9ee SHA512 d5638364a54940b32088c1b2382b85c1e6126c8f7e1b0c41a20f8d3a59efe760bc30defd75c6089d2918ce7c9e5ad973da45ebbd7aec7d87450fa15043355f38 WHIRLPOOL 059e3844e12f23cabfd62a35dd6fa94ce279de374521b0eca89225204981f66bc597a5b035365460a740755327b25a66a96dbd95ad32bab2a341a2a756e8ba31
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
@@ -20,17 +21,17 @@ EBUILD mysql-5.5.39.ebuild 4595 SHA256 5008452dda4183033da27924fa0e7368039990ecb
 EBUILD mysql-5.5.40.ebuild 4077 SHA256 b7d0b692e701cb51758707c5d8715e326f0b10a28b066a4cd49963a5b70bd7a5 SHA512 eb3f01d3c927836553ebde49ea49ea38dd92cfd859c862f7480fa31eb677119863868d4506d3f5d7fcef2ef6c9f1edb31b55e381faaa84e3638dc1da8d77695d WHIRLPOOL 55fe1e58fbcd5d9dd7699b5a08508d00301cabf979fb566937dd5554571470909e5a5e55e95281651f50ea759d375fdb7133cc4f95e4664db8b1e2221d9b5636
 EBUILD mysql-5.6.20.ebuild 4966 SHA256 3899dac6c6db49d443f37fef2927e1122c39306549e7d4a19f2c5ffc78ed5e0e SHA512 fbe2aa9489ac2b01209785edd15e5e0ca1015a260a29721f65f3207ef8e2f67dd3cc31552e4dd0b1370db63dc42ead54363977a8597aa5dae17d3837ed891d68 WHIRLPOOL 926f210c2d90d8b4ad7a5b3f6d886bd6afe622e3a24fb77774a0be7b37d87bad31848a7138a2e7f2a895ebe44c5d9b1ca2acb354ecb3c996031c336e810375f4
 EBUILD mysql-5.6.21.ebuild 4838 SHA256 b9e7559dd544f4ffd2abb332d86e413f36f4d237e2bf8b1266b7fd9578a37901 SHA512 f3b51d93034dcedbe4f2c3907d4cb6284792bf9e95d5ba528a91a59eff41d120052069c4ac6e2235de6ee74ad719d1bb0a5eb6816c5c85fad5fa492a7f05cd61 WHIRLPOOL 97d4c32e202003dce6e9afae70f357075988101958c50d028c6e197576c006ca99f4d04a8aef8b675ce2617d684feaca219df542a92a187c5407cca97520300a
-MISC ChangeLog 20341 SHA256 6f4a5fa59a08aee71bbc02a1ddb7e6b652d001646264271bb6ab04b32e097f12 SHA512 8ed118bdce2bad21062ad5e79a415d21375292aa566b2dcba93c82c6c7b03170778866bf51b5f5f761fdbf8c7e520d9a76e01ecebc9b66b075d27c4fe4ee7033 WHIRLPOOL 33f2f83a2cbe4ba0e6fe04c9f5dd8e45d71c7b224e6cb7ffca61930d1b612d9586c228bee837312c9d761db16e9f6a48ee7e76c17427dcf7248019071cf34982
+MISC ChangeLog 20461 SHA256 8cf665af1bc62af266b590ab9b3b9e5c7e1e02194a346d527c34b4880f722b92 SHA512 5624c9fb7ad196119747246000f820638312cbb5a145aa90cba418d17a0fcfda8400d10727ad5e0f763efaf7f87f0479c8a68064cc44b103ede08e6b14cd36e4 WHIRLPOOL f93a0fea7be584b9647a8e9c89b9b337dcd99bd43ae4762052d3a356b5b997a85b18cfcf11500c4a587c5c1aff3741615332d080de25c48073a2d40594413494
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUMtLHAAoJEE4V4vFnx44dHBQH/3X5/uTHoWsVJ4d+JW5XJsc2
-f+y+zLPkyu5ZzRVdET1XPvDhXpmb0HsNz8jueFm1qz8BrWlDU2/kmBfEUd+eLUMC
-MZMkuTCp1ROOlIQpt4VG/du6R5aXhGVvtnUYd4+M3veIlk/I+W8M/bGJCMchLAWk
-QZKgByARc9SaBXf5M9vK9YPwvlrxLrry2yP/vAPimQIdCqU5tQulgOb5W9OlQV0e
-erAVqZ3tJTDjxkFJ0wr/UA+fq/aDRza3QTgSxw8ytFqJ2vc0stA0yd7TB0rBhZuH
-ogYC3s1dz5o/n80djeKhHkKAXvVs3Qgi6JRXxM79/6/VMyfkIhKzmbmOBxs71aI=
-=G+z/
+iQEcBAEBCAAGBQJUNWmDAAoJEE4V4vFnx44dP9wH/0BAa7agN/ldG/SyeuwZJ/fm
+xli189MQ+ko5qlw8heK7Jauv9C3hr8jiTPSEb2biAgueYZsIDX4X5MyNm7OXARCR
+Hre28HE70oi4KdcWHPb/2/rCEa2+T/Ipqtw6/FRW2EFjggOgfO/cRZhZWOo6AIl8
+XjaB/Z/gHZadkZ/ixCDB5B+BWXMLVojeV9n16e91StjGshxuybySH6i5cR6QJIOa
+Osxo+7Gn7C9Hab3dyLc92XM3xhzi+UgizUzewPhXY+Tk+BjkSUjneynaegT3uAKl
+mKmJKMvCHAk3+xJkc3v4t7c3/MU3vUrKeRAgsTtNBwNSVNIoSkprq1p1XID6eqs=
+=z/VR
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/my.cnf-5.6 b/dev-db/mysql/files/my.cnf-5.6
new file mode 100644
index 000000000000..1f37ad5e4ae6
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-5.6
@@ -0,0 +1,141 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.1 2014/10/08 16:42:41 grknight Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 4M
+table_open_cache 			= 400
+sort_buffer_size 			= 512K
+net_buffer_length 			= 16K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/dev-db/percona-server/ChangeLog b/dev-db/percona-server/ChangeLog
index 3cd9e95f263a..537028dfab1d 100644
--- a/dev-db/percona-server/ChangeLog
+++ b/dev-db/percona-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/percona-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/ChangeLog,v 1.4 2014/10/06 17:40:34 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/ChangeLog,v 1.5 2014/10/08 16:43:14 grknight Exp $
+
+  08 Oct 2014;  <grknight@gentoo.org> +files/my.cnf-5.6:
+  Add new 5.6 configs to better match upstream wrt bug 524768
 
   06 Oct 2014;  <grknight@gentoo.org> percona-server-5.6.20.68.0.ebuild:
   Update test data locations wrt bug 524158
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index a6752c0a7225..8ce91c5d0702 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX my.cnf-5.5 4909 SHA256 fcfa04270e6b2d84258bdb16f7937fd57c3072078eaef909edebe91d390785fc SHA512 0d0b6fc99606fd1364cf5e3cc4880ae82897c798c7af4887ca85e61ef0f9619d3eea747878fd7ae21cca41af351bd8c4135c9a57b2a3433c263dd7fb44e8ba16 WHIRLPOOL 3a99ddb78827e85c8f35eccc94e7f148d3f772da5230fe8f670e4b6030f846d7f20d27ec37cc90814ae23585f19a83c1af2243cd66e773f2e7744c24cd4fa7e8
+AUX my.cnf-5.6 4683 SHA256 b61cbaca9e9290f600c7f001bd544aa2a4ec2b92c04ef8e1abc8a92abce6a25d SHA512 c877a5e862c508faaee4f61863deda1402c8dc509b60dacd5ec35784ee2df8075349e31d90df07e30f10b6a23e71977d6b6e0d3246278126504594c88b332fde WHIRLPOOL 14a04dbb8d4a0045bdb2e875d0c140c6b03580c64c64fefea4f8540d9aecf0282edb78911a53c6abfbdf73f2cc691da9a5dc8143e9f63eacc552ef8de6066d45
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
 DIST mysql-extras-20140817-2331Z.tar.bz2 1494554 SHA256 c2e338b4e6933d87696cf8c15b5c17e41c0227c05cb123ef2c84e78f26b04b0a SHA512 40a181eabbc112d0408883cf280cc14fc694d971601c35c34b8d6bde6f931aab3f909952676a23457773a5d015f17d57d7b409818ff8569a4b8977638ed80456 WHIRLPOOL 24d74c5be9514b59b18673777aa24f358c7ce4f2daddf23598eb910ca05baa22631849c406c581a864ebd0836b56a7f5ff69bf7377c2dae9d21e96c670ed0e3e
 DIST percona-server-5.6.19-67.0.tar.gz 34127811 SHA256 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 SHA512 62b08b074d94f19e28e6aaf73f1419ecf589bd441b75efa7f27dad78705623b6002f5fd510832afb821d70315c7537042977cfbbab5317dfb1f6aca6d4224dc5 WHIRLPOOL a36725f1500125e4a7ce3714cc1b67c9bd90180e4eb0fce2237a8cbebb956a5d014934aa9b405f510fc3514a6a7dffb1301394c21b3ec129517ba25090ffc0d1
 DIST percona-server-5.6.20-68.0.tar.gz 33900890 SHA256 68621fdb9cc195309e8d56eacedd9a8b97c86bdd1a6f0f2d8e300816a1a1d7cd SHA512 cf0c52967d5645f3e4bc3b5e2ef2158c94461dbcd21c08cc6027845ac4a46201642db59085dc487111db98539088c3c920c121673452af5e7aca6ae0b89370ff WHIRLPOOL 582ebbd4c6a633ef895936be873bb7b844515e49d5353ffc45d9814f436562595f41e22703a069688c62c186e67f585e6aac664776d83d6b169b8000aa09c85d
 EBUILD percona-server-5.6.19.67.0.ebuild 4504 SHA256 d5dcf4e4544eaa7badf9163d2a9b0c3ce8c04ca0c473123002b66580931794cb SHA512 dcc9a78599474734decbbea6dfd3d2e25cc01b428c34e6568f9ee5819d34c40751ff825dbb48761d93ada6eec43558ab0178e770ea6858fe9aae427547e883b9 WHIRLPOOL 5aa644af2b5c17f6fda67f412a45af9a956372f04eaf4c13173e7e8a72b93a4b5241e361c121839f334116a4c0a78d1fb33f7b9c55b3e296f58311aa6380559b
 EBUILD percona-server-5.6.20.68.0.ebuild 4512 SHA256 417886f4e26c8ec08a23afe5627ed130f9ccbf2a96101f4d6c9bc09e54932086 SHA512 8715a2c605a9a172d5205d3ceecdf38429c5485fae46d8a868fb2bee3d1853035e26a5d85cce04b4f478d11544c55c17474636767697cba89a32bab195b41a01 WHIRLPOOL e3dbf8aba4e2d23fa5b49cf7c8fbf219806558f526dd8f8f1344936a54490d41bfab7910f4c6c7396613aa3076670e54eb9815bb4416c3c622c03d35405e08f7
-MISC ChangeLog 974 SHA256 40d8d30771d8364b9abf472c4d95fff438d861e8c9487a7cd925138c16db9897 SHA512 a8185c7af3295b0ad4ce4fd8fce2d63d2400ca0ba7b98c72890747cbef519be07e44dd7fc6887da8040039019dcbb0a0066d51a3796c9fd3c4aca5cde22c9dcd WHIRLPOOL ffe8d631321e69b8080f85f79f42f27c9f91ff54ca7ef038f6bd511b1f2a61de5dd41d7b26b97f2e750b6f3d47563d92fc696f42be540e31d9322ed231e19e2d
+MISC ChangeLog 1094 SHA256 6b3f5cc25218da3c035dfaf243cd788c5c4ba2116957f637c8801fd8163e113b SHA512 cd23789f758a765e9e6ef4e1e8cffbfaae7afc21b4a0009055b20a21b4a75dfff3ded6c7fe9d6e70f02e2a86da0765c220d21b63819e21e085eb300198d0540b WHIRLPOOL bd1a651c4eff7febe7a3a6f83c13558b7b61c2b70e0f14739a65508063a56907b8fc2da2acd0cdcffe88b8d53cc76bd65ff65cfd9e37ef0e6076d7d3025ca3e9
 MISC metadata.xml 1088 SHA256 cc86c936f1bad3cfd435753a665dc928fc07700af3a77debecca068e3240abf7 SHA512 6663e5e9e9f4515e8410688113cc46a265b1499819a97a9c6fa83a87075017dd84bd026834e9d199d299d2f36d1f8555abf24e2a915aad4773b999f89a8029d0 WHIRLPOOL 7a7f8a8d15f101c0fd02ac3ad828ed988e66fd16933c4b7db8d4d356c0c46ec258c027be2a0cba098d8bc197f8a330d426b57ce5ef25694fd3acd328b7b866ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUMtQUAAoJEE4V4vFnx44dnDMH/R9uJ371sypsB2n4JwTxo6wy
-ht3io7lxPPjl09JGYZkL8JdaCnIsE5fKjbpx5TMtUndOaio0ULMufmhj3/X5urnc
-BPIbR1sPsOvXs8SMX5MbGGS7vacp0ymhzejsENW6IwYjSHjCJA4m1nXwr3F2dMsN
-+B+uLXrcdk+0P0AXFYfiedjmulVWLiKiXPfk4wXTPzjmCJHwBq+uUAn+su8FQEB7
-HXCJ/sxVKxVdahHurEIt9Ek7u+f1yMrBP6V94jkCegbttyeSwrfDmGXc/RsG1Wyi
-yWgxjrSkWVWccn+TtYWNHZ2Ohv5bd2N0e9UbxDwrYagoRQzh+ojYj5TMDjEtUoI=
-=5Ovf
+iQEcBAEBCAAGBQJUNWmjAAoJEE4V4vFnx44dLPQH/AtKmI/JDM9ReO52x9F2qogR
+2oLZi2c4qP6SnVMaoW9S1ByPRSqbMyO/VSXVr7rVLfErbLTk1vpQlCqCSgfY18IT
+39dEB/matJx1qA/8tMpzpBKksUVSxF1cvCpKruPj1Mw/sXIfmiYCodKcNFziyosU
+55icDd3Kjj/7FRqj1thUz6UeHOq8/CG/ibR5hQkuzs4xLtamPv+VDdhzf8pqkMZH
+e5HaSyD4EIMx5JYS557t/yq1HuG5JZ/9LJvN+5R1/TijIx5OLtBIqHdLbU9zLP1y
+Eulf/u1ROq639gg7AS/pn57TW+3Pd7i3MYBBgDPH+6b+dmIYc6pmLXbhNi5zdM0=
+=TCFF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/percona-server/files/my.cnf-5.6 b/dev-db/percona-server/files/my.cnf-5.6
new file mode 100644
index 000000000000..5d4a6cda5fe7
--- /dev/null
+++ b/dev-db/percona-server/files/my.cnf-5.6
@@ -0,0 +1,141 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/files/my.cnf-5.6,v 1.1 2014/10/08 16:43:14 grknight Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 4M
+table_open_cache 			= 400
+sort_buffer_size 			= 512K
+net_buffer_length 			= 16K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout