Bring mysql-5.5.37 from the overlay - thanks to Brian Evans.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

4 files changed, 165 insertions, 26 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 70e009758dfc..af1b84a48ab2 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.666 2014/04/24 13:31:00 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.667 2014/04/25 00:43:46 jmbsvicetto Exp $
+
+*mysql-5.5.37 (25 Apr 2014)
+
+  25 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.37.ebuild, files/my.cnf-5.5:
+  Bring mysql-5.5.37 from the overlay - thanks to Brian Evans.
 
 *mysql-5.1.73 (24 Apr 2014)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a7595c245a81..a2f5759e8c1b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,7 @@ AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c
 AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
 AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
 AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
-AUX my.cnf-5.5 5000 SHA256 ea119fee667ed963ad20b807a5102ad776035df4009f3bfc819b26a47bb0a3db SHA512 1265cf6d1fd3dfa9d0607eef0065409e4d6a8187e8e6882a45e69da7fc0a337a336c1fd3ef3bd66a8707f82818def70d30e66f487b57cd75f094acc4f467ef94 WHIRLPOOL 52abef494668f35d29241d5cb89b5f197671d1224465c25b05f59a265dc940b9a4797f13fa499279a649a84f1a7090db180ae7bec889d49914981773aa6f6198
+AUX my.cnf-5.5 4905 SHA256 952c0c7429f3c85355ef94cfbd02a905bdace248e1131ed3d94d8c7aad76d39d SHA512 9ae23c0bebceea7e2874fb080d0da57707f362a5f6bd685ff6e8fa70f1f775e52b43dd058cae5c55eee04806e01794bc474684e4a1c68f9609a68e4417678b68 WHIRLPOOL 1c1eef2aa5b7445e0920d4f4579d225b8c6aab5851b0ed8553442ccb4682229bf615b8c974c69433b76879356effcc88439a36d016a9e826df20cc7b2111ce0c
 AUX mysql-5.5.32-Werror.patch 620 SHA256 bb2cf6f5b1546a310a64d94e80e0583354c7223fd223169280f00268dde1410b SHA512 a1fdc9619e6d6d6cb708946ef7951854f6d8e481d4eb9d47495c1a9114cd835bc34f50815fcf93ede8c055b2cd5c28454c610f94263c8745f9e26f69de85c925 WHIRLPOOL aa27642e499d4dcc611c5b9caf591c3fa5b3b9e0558660b4a3adea7e18e0fb6c7bfab8684be18bd17d42b4ec01a1aa747a61f26730370c813f500d870c8d3640
 AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
@@ -14,6 +14,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 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.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
+DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -28,23 +29,24 @@ EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd543
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73.ebuild 8892 SHA256 b9d11ccea1c1f699ebacf94d4261beb25fa88c7b351a38034137fb39f4ef9979 SHA512 5c562d8fc17682c8992f17290717b1e5a68d2eda6e9e8d4c960cc316db376e5171e85d16a8695c6cf02b27aab38215cf4e3163adb1641ef3418ba08cc6f53b31 WHIRLPOOL 1cf5de9c01bedd88c976ff16890ff71c695af9af676f13947964d40c33a15401a63ec63403c5076fc56fd00ba343f19f1d84dfb1ebbc1f15cc80253cb2e947ca
 EBUILD mysql-5.5.32.ebuild 4336 SHA256 e0b85387c000151ce4e450c36f70b4e813b607c21d7e3226c038963e0d84a12e SHA512 cbe0a2165054f47c0179cdde1cec176be75d4dc13edce00ec9f8eddbb5ae4dfd8bc55a572cb083cf5c52d9bac4b732c6a0c4a635176d63022f68118acfe7980c WHIRLPOOL 351e194f73bd597d5055735ee9d119343503a42281bec830cc492ae919b101f1cd13db6d7eb061d58ef9a78a7290372fdbc51832c058454c4a8d1eb81248562f
-MISC ChangeLog 16455 SHA256 32752fc7ac1154bdba5071314ebfe2e086ee37988268ee92fc4aee658420ff72 SHA512 5b206d62221f9f9c20504d84e3961cdfc494c87d9de65138518ba1a2d0f80587678c3481624be6ce517be6cf9eaf12c28569275dc9a6094d2d06962af492574d WHIRLPOOL db6553442c6f9f8aabcd8888e2d1e05f48b2f43386fb5ca589bc2cf27bef07ead7cd0e31b19d4de582d2bc3817ade0091bb27a6026ccac98b34f20b75329083e
+EBUILD mysql-5.5.37.ebuild 4543 SHA256 ed78bc8766b7c70b4254f73ed3112586e26893d565eed64401c8e330dc6af3fe SHA512 8a77015c3232aaa3c3bcbb2832d55fae3325f92fe7b050e3068fc282bf0503f98ea38b3a83f148f27657de506cf759238d8a671f8d6f45702b219dc71d49dca8 WHIRLPOOL 73e4a1849ae27f6fad64ced9c5b70954ca4d7c807d7c33fa77043498969cec45aebed82305c714cefde4350e77a1622cb8f796ba1086d005a9c25e13080561ed
+MISC ChangeLog 16657 SHA256 ff9eb5ed09ad0ff827b3b69308002d93bcaaef5e23ea2db4155af7c6a99cd3a2 SHA512 ed336503b1367b67defe184dd1daeb321f9bf53d2f3884fd48e67121d1c4a55c278a87b89244084152b48d997ecd53921420e9bf226392ac9e8a5d50c0895f01 WHIRLPOOL f895e6255c166b0b099ae7eee5f7f111defae7b99e843f24ab69dda7ea048bbd14e8201a9454fe6cd8e93e7c632c9ca051592b73d6375d96e91a7649f341fc56
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTWRGyAAoJEC8ZTXQF1qEPmwkP/0diFXQHzXPULqedgFXbS5pK
-qST0TYIKBiZvrVcbA3geX20JKvW61cVbz+uj5kyvl2GsSyD0CE/Ld6X+iJduPMYy
-F2QDV3eOZy1QuFMEtn8rMmM9njt1IgJ/iUfE5ZcffP0/2s5kCp64phPLFa3dN92d
-hUoEpOn/PvLqeqCwgGHTxSgT/CFZ8UDaWUQTy+IpNnd8oNpT73stgJOuLTTnCNmv
-hZ7Tn8uzpZxHBFUVMTPvdrwFehOA/16p/8f9ah56SZQtf6SUMU84nIfjSGKIJDSr
-slTPK8mmwgpDOOKK7b6s1PqGsU/P0VCrOcYn80t+boBRg8l1V+mkOqHYzj4khuKy
-5Mr6dDx+sXvdexVZHzstx+97wVvUx5S+yitZQWfx8ASeK5xwqbRqRfywiWI5x6SF
-iPsgwAH67IUzYpGdVEDhhQlfA+q+yNvWJq1fnSm4Q3GOc6OmpNmqGHfqQCeAGHcV
-DVw+Nwpw2NlGm19XqwXY98wzKO/K3gmO3Yp763CqSfTAVGKs/Q8c1J5ZBBnr1tWr
-vcu15D8D/tv4xjhQdV4rIK+x2qz/nJhmG508+yKeS1ok+9VJ8lqkavTEwLuiGqmS
-jyAk7rW33KL6ESJKHg6P4En03cgukDR1/ghPG8vzxOwWNrgF//2Be2lRDSAzyS9P
-sq2UMgmOvGahet/cWy8T
-=z4pF
+iQIcBAEBCAAGBQJTWa9YAAoJEC8ZTXQF1qEPQMUQAJDfDHzGPo/1/lW2xIQTLpq8
+gBeyrrmKFIcio3cqZ8zm6g/RdqzjuW0vxaelSTz4f9twyUF/ih8cBh2ZAaHlDQ52
+IoEM5yChu/gZU2HY72JY8acL9CY3+5D1CLMRBg2n0tlmogjLx/sNV4NMOF6LHXKF
+UYZwh50QiXfm6WLgRMcoMKxvR9O+aRVlrl5nnHwLMAlHPd3NRESjxBKRsw4uDX5O
+ATakIEVuOxH052DvEsbGQrM7qtd7DZ1N2+XU2QaaQsNeiywvPTrMXh0HVmFe7403
+0DDFR4bV3E2Ua2U8uKAAwlG2OibV/998CRTr2uNsXRH7UMVezHl7PemnXtRuV1FO
+ch0YJRD+XQ1sKJTX05Hd5xxxWECdShjaC9D2ZHJ2/73zBXGb38j3dsZt8VtRY/uO
+t0S5RSHSED6TTTX3lvAAR1sVxswJrxTeVnozHUAKITZlvhqbgFc2DC9yvK8hwSvA
+7J7k19UUht32kHp9/njVUSA/fbxxKL5E2sCy5NgjAnF4M69ZwK5au6/JHPHr9g6s
+R/A9f+1QiEv+nMNKSkWcD2nD4IqTrRdWfqVvd87bj+RTjAHcWm2tPypdIuCWJyxq
+ZdnkfmRK6eYWdEyTbSd+7Gf9il80svp0bc9SgnDj3rKcRVT0/ALUgRHIG37hI+v3
+hIKhGuwQLGbCR2vc2HnP
+=TyB0
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
index f43d535a7fd0..86c379f189d2 100644
--- a/dev-db/mysql/files/my.cnf-5.5
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -1,5 +1,5 @@
 # @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.3 2014/04/25 00:43:46 jmbsvicetto Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -52,7 +52,7 @@ log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
 basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
 datadir 					= @DATADIR@
 skip-external-locking
-key_buffer 					= 16M
+key_buffer_size					= 16M
 max_allowed_packet 			= 1M
 table_open_cache 			= 64
 sort_buffer_size 			= 512K
@@ -86,10 +86,6 @@ tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
 #debug						= d:t:i:o,/tmp/mysqld.trace
 #one-thread
 
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
 # the following is the InnoDB configuration
 # if you wish to disable innodb instead
 # uncomment just the next line
@@ -137,16 +133,16 @@ max_allowed_packet 			= 16M
 #safe-updates
 
 [isamchk]
-key_buffer 					= 20M
+key_buffer_size				= 20M
 sort_buffer_size 			= 20M
 read_buffer 				= 2M
 write_buffer 				= 2M
 
 [myisamchk]
-key_buffer 					= 20M
+key_buffer_size				= 20M
 sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
 
 [mysqlhotcopy]
 interactive-timeout
diff --git a/dev-db/mysql/mysql-5.5.37.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
new file mode 100644
index 000000000000..3454e78d60de
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.37.ebuild,v 1.1 2014/04/25 00:43:46 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20140424-1043Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}