From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RsA1y-0006tu-PW for garchives@archives.gentoo.org; Tue, 31 Jan 2012 09:29:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83BF9E0429; Tue, 31 Jan 2012 09:29:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 33050E0429 for ; Tue, 31 Jan 2012 09:29:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E03B1B400D for ; Tue, 31 Jan 2012 09:29:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 06A6480042 for ; Tue, 31 Jan 2012 09:29:29 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <6793ce9e3a9a78606d98f6c0972243a4feb19acc.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/ChangeLog dev-db/mysql/Manifest dev-db/mysql/mysql-5.1.61.ebuild dev-db/mysql/mysql-5.5.20.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6793ce9e3a9a78606d98f6c0972243a4feb19acc Date: Tue, 31 Jan 2012 09:29:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 230465bf-ed62-44e3-848c-7800941a4a8c X-Archives-Hash: 41795cd39e3731785f49905dcf0e0d5d commit: 6793ce9e3a9a78606d98f6c0972243a4feb19acc Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jan 31 09:29:20 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jan 31 09:29:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D6793ce9e Version bump, passes all tests. (Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --forc= e, unsigned Manifest commit) --- dev-db/mysql/ChangeLog | 9 +- dev-db/mysql/Manifest | 4 + dev-db/mysql/mysql-5.1.61.ebuild | 261 ++++++++++++++++++++++++++++++++= ++++++ dev-db/mysql/mysql-5.5.20.ebuild | 129 +++++++++++++++++++ 4 files changed, 402 insertions(+), 1 deletions(-) diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 5e8cd83..1a52010 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-db/mysql -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*mysql-5.1.61 (31 Jan 2012) +*mysql-5.5.20 (31 Jan 2012) + + 31 Jan 2012; Robin H. Johnson +mysql-5.1.61.ebuil= d, + +mysql-5.5.20.ebuild: + Version bump, passes all tests. + 20 Dec 2011; Jorge Manuel B. S. Vicetto mysql-5.1.58-r1.ebuild, mysql-5.5.10.ebuild, mysql-5.5.12.ebuild, mysql-5.5.14.ebuild, mysql-5.5.15.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index d995128..bd02b12 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -7,6 +7,7 @@ DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf3= 9d0c0726e5cb6f47dc1bef0 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c= 07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399= 655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c= 98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c= 0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7 DIST mysql-5.1.60.tar.gz 24408313 RMD160 7bbfce4fecc2a8e1ca081169e70c1a2= 98ab1b75a SHA1 26ae4d2f7e7066644eb343ab519cbef1626069c2 SHA256 2829fcb739= 3bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53 +DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a= 29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c642428= 2e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b= 3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2= 626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a= 427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee589= 3f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d= 738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb= 1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738 @@ -15,6 +16,7 @@ DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf25= 4077c709375e7ae48a21748be DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d56= 34838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7dd= b2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1 DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547= 299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5= 602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411= 375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378= 101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f +DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f= 6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152a= d3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a19= 27f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b= 3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd05325= 9fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SH= A256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8= f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SH= A256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37 @@ -25,6 +27,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb0= 4f3e641018824d714926ed65 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a275= 5e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a= 57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e5= 2f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a575= 12c78a110e00d205f6548859d53e790b994257494f5f1a9e6951 EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34= d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45= 832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff +EBUILD mysql-5.1.61.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34= d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45= 832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c8= 6cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0= b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c8= 6cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0= b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c2= 8546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935= a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5 @@ -33,6 +36,7 @@ EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e2= 73045b775534658c28546d46 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c2= 8546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935= a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c2= 8546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935= a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac48040687= 14b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f6= 8baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01 +EBUILD mysql-5.5.20.ebuild 4234 RMD160 26eaee55ff2e336fdad5de7a8833b845c= 7448bec SHA1 b1450bb0baa3064d8a442b240a2f63e9703254d7 SHA256 39d742b618f8= 4374097279fc3ce11017b0a2dd613046ba262c5dbe07b65cd2dc EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704= 627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f3= 08eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd MISC ChangeLog 8557 RMD160 bb446dda1050e319c96c6a38ce32308345429b71 SHA1= 4f5721841f563f980e0eda3a1e57163daad52de8 SHA256 07b9af8932bb03c3412e3530= 86da17c11c8a271347ec89264466303857bb78d9 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 S= HA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba= 9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503 diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61= .ebuild new file mode 100644 index 0000000..0c85a89 --- /dev/null +++ b/dev-db/mysql/mysql-5.1.61.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.= 1 2011/07/13 07:37:01 robbat2 Exp $ + +EAPI=3D"4" + +MY_EXTRAS_VER=3D"20111118-2347Z" +# PBXT +PBXT_VERSION=3D'1.0.11-6-pre-ga' +# XtraDB +PERCONA_VER=3D'5.1.45-10' XTRADB_VER=3D'1.0.6-10' + +# Build type +BUILD=3D"autotools" + +inherit toolchain-funcs mysql-v2 + +# only to make repoman happy. it is really set in the eclass +IUSE=3D"$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these= . +# This is often broken still +EPATCH_EXCLUDE=3D'' + +# Most of these are in the eclass +DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 ) + >=3Dsys-devel/libtool-2.2.10" +RDEPEND=3D"${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 +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE=3D'berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES=3D'test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" =3D=3D "localhost" ]] && die "Your machine must NOT be= named localhost" + + emake check || die "make check failed" + if ! use "minimal" ; then + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=3D-userpriv is no longer supported by upst= ream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + cd "${S}" + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus_unit + local retstatus_ns + local retstatus_ps + local t + addpredict /this-dir-does-not-exist/t9.MYI + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))" + + # archive_gis really sucks a lot, but it's only relevant for the + # USE=3Dextraengines case + case ${PV} in + 5.0.42) + mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" + ;; + + 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) + [ "$(tc-endian)" =3D=3D "big" ] && \ + mysql-v2_disable_test \ + "archive_gis" \ + "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" + ;; + esac + + # This was a slight testcase breakage when the read_only security issu= e + # was fixed. + case ${PV} in + 5.0.54|5.0.51*) + mysql-v2_disable_test \ + "read_only" \ + "Broken in 5.0.51-54, output in wrong order" + ;; + esac + + # Ditto to read_only + [ "${PV}" =3D=3D "5.0.51a" ] && \ + mysql-v2_disable_test \ + "view" \ + "Broken in 5.0.51, output in wrong order" + + # x86-specific, OOM issue with some subselects on low memory servers + [ "${PV}" =3D=3D "5.0.54" ] && \ + [ "${ARCH/x86}" !=3D "${ARCH}" ] && \ + mysql-v2_disable_test \ + "subselect" \ + "Testcase needs tuning on x86 for oom condition" + + # Broke with the YaSSL security issue that didn't affect Gentoo. + [ "${PV}" =3D=3D "5.0.56" ] && \ + for t in openssl_1 rpl_openssl rpl_ssl ssl \ + ssl_8k_key ssl_compress ssl_connect ; do \ + mysql-v2_disable_test \ + "$t" \ + "OpenSSL tests broken on 5.0.56" + done + + # New test was broken in first time + # Upstream bug 41066 + # http://bugs.mysql.com/bug.php?id=3D41066 + [ "${PV}" =3D=3D "5.0.72" ] && \ + mysql-v2_disable_test \ + "status2" \ + "Broken in 5.0.72, new test is broken, upstream bug #41066" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to rege= n + # ourselves. Alternatively, upstream should generate them with at leas= t + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.0.*|5.1.*|5.4.*|5.5.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_k= ey \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ + mysql-v2_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade, main.information_schema, + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers= : + # fails due to USE=3D-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.not_partition: + # Failure reason unknown at this time, must resolve before package.mas= k + # removal FIXME + case ${PV} in + 5.1.*|5.4.*|5.5.*) + for t in main.mysql_client_test main.mysql_comments \ + main.mysql_upgrade \ + main.information_schema \ + main.not_partition funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql funcs_1.is_triggers; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. + # These tests are picking up a 'connect-timeout' config from somewhere= , + # which is not valid, and since it does not have 'loose-' in front of + # it, it's causing a failure + case ${PV} in + 5.1.5*|5.4.*|5.5.*|6*) + for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do + mysql-v2_disable_test "$t" \ + "False positives in Gentoo: connect-timeout" + done + ;; + esac + + use profiling && use community \ + || mysql-v2_disable_test main.profiling \ + "Profiling test needs profiling support" + + if [ "${PN}" =3D=3D "mariadb" ]; then + for t in \ + parts.part_supported_sql_func_ndb \ + parts.partition_auto_increment_ndb ; do + mysql-v2_disable_test $t "ndb not supported in mariadb" + done + fi + + # This fail with XtraDB in place of normal InnoDB + # TODO: test if they are broken with the rest of the Percona patches + if xtradb_patch_available && use xtradb ; then + for t in main.innodb innodb.innodb_bug51378 \ + main.information_schema_db main.mysqlshow \ + main.innodb-autoinc main.innodb_bug21704 \ + main.innodb_bug44369 main.innodb_bug46000 \ + main.index_merge_innodb \ + innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \ + innodb.innodb-autoinc innodb.innodb-autoinc-44030 \ + innodb.innodb_bug21704 innodb.innodb_bug44369 \ + innodb.innodb_bug46000 innodb.innodb_bug48024 \ + innodb.innodb_bug49164 innodb.innodb_bug51920 \ + innodb.innodb_bug54044 \ + ; do + mysql-v2_disable_test $t "tests broken in xtradb" + done + fi + + # bug 332565 + if ! use extraengine ; then + for t in main.range ; do + mysql-v2_disable_test $t "Test $t requires USE=3Dextraengine" + done + fi + + # create directories because mysqladmin might make out of order + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} + + # We run the test protocols seperately + emake test-unit + retstatus_unit=3D$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + emake test-ns force=3D"--force --vardir=3D${S}/mysql-test/var-ns" + retstatus_ns=3D$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + emake test-ps force=3D"--force --vardir=3D${S}/mysql-test/var-ps" + retstatus_ps=3D$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as wel= l. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures=3D"" + [[ $retstatus_unit -eq 0 ]] || failures=3D"${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures=3D"${failures} test-ns" + [[ $retstatus_ps -eq 0 ]] || failures=3D"${failures} test-ps" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-db/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20= .ebuild new file mode 100644 index 0000000..18ef035 --- /dev/null +++ b/dev-db/mysql/mysql-5.5.20.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.= 2 2011/07/14 03:58:44 jmbsvicetto Exp $ + +EAPI=3D"4" + +MY_EXTRAS_VER=3D"20111118-2347Z" +MY_PV=3D"${PV//_alpha_pre/-m}" +MY_PV=3D"${MY_PV//_/-}" + +# Build type +BUILD=3D"cmake" + +inherit toolchain-funcs mysql-v2 +# only to make repoman happy. it is really set in the eclass +IUSE=3D"$IUSE" + +# Define the mysql-extras source +EGIT_REPO_URI=3D"git://git.overlays.gentoo.org/proj/mysql-extras.git" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc = ~x86 ~sparc-fbsd ~x86-fbsd" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these= . +EPATCH_EXCLUDE=3D'' + +DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 )" +RDEPEND=3D"${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=3D'berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES=3D'test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + + local TESTDIR=3D"${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}" =3D=3D "localhost" ]] && die "Your machine must NOT be= named localhost" + + if ! use "minimal" ; then + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=3D-userpriv is no longer supported by upst= ream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=3D$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))" + + # create directories because mysqladmin might right out of order + mkdir -p "${S}"/mysql-test/var-{tests}{,/log} + + # 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=3D-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) + # + + 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 ; 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=3D"${S}/mysql-test/var-tests" + retstatus_tests=3D$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + popd + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures=3D"" + [[ $retstatus_unit -eq 0 ]] || failures=3D"${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures=3D"${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + + einfo "Skipping server tests due to minimal build." + fi +}