From: Robin H. Johnson Date: Sun, 21 Feb 2010 00:58:52 +0000 (+0000) Subject: 5.0.90-r2: Bug #305221: Fix ppc64 builds with new revision due to updated patches... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=752edcb62c9cc28d46fa7d099101d8c6058d1e8c;p=gentoo.git 5.0.90-r2: Bug #305221: Fix ppc64 builds with new revision due to updated patches. 5.1.x: Drop older 5.1 ebuilds and add .39-r1 and .44 using latest updates and patches, ready for ~arch. Package-Manager: portage-2.2_rc61/cvs/Linux x86_64 --- diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 52a64473dd98..44e1ac39abea 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.508 2010/02/15 21:27:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.509 2010/02/21 00:58:52 robbat2 Exp $ + +*mysql-5.1.44 (21 Feb 2010) +*mysql-5.1.39-r1 (21 Feb 2010) +*mysql-5.0.90-r2 (21 Feb 2010) + + 21 Feb 2010; Robin H. Johnson + +mysql-5.0.90-r2.ebuild, -mysql-5.1.39.ebuild, +mysql-5.1.39-r1.ebuild, + -mysql-5.1.41.ebuild, -mysql-5.1.42.ebuild, -mysql-5.1.43.ebuild, + +mysql-5.1.44.ebuild, metadata.xml: + 5.0.90-r2: Bug #305221: Fix ppc64 builds with new revision due to updated + patches. 5.1.x: Drop older 5.1 ebuilds and add .39-r1 and .44 using latest + updates and patches, ready for ~arch. 15 Feb 2010; Robin H. Johnson mysql-5.1.39.ebuild, mysql-5.1.41.ebuild, mysql-5.1.42.ebuild, mysql-5.1.43.ebuild, diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 2ddb6da44196..17eaa641c446 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -15,9 +15,7 @@ DIST mysql-5.0.87.tar.gz 22231820 RMD160 b6a6bf715e4b9b71d62ecb13d2e5b47b5380637 DIST mysql-5.0.88.tar.gz 22932765 RMD160 a3ba4bd04e573b4a0bab073f36eec3ff44348ae6 SHA1 2dc7a462eaca1452eefd334888a6c40022deb352 SHA256 c7b0265134fae6bcb254ae9ae97f580849e4ac491c2bfe136632abe74cb2f84a DIST mysql-5.0.90.tar.gz 22299626 RMD160 634655530100e5c00bfab9e2c498efa8c5208baf SHA1 c637d0afed52de1e3326824afa954d1ffbcc7a2f SHA256 0b89829611fe749c4d0c6007c076f80881b9309e82019b8c61184b3b284543a1 DIST mysql-5.1.39.tar.gz 21968309 RMD160 255f643582bc5d59932d3a1719420fb9ea2dbcbe SHA1 29389e1af27ebe7d20e7e2637a8d89de35e34180 SHA256 341b35e76c7186805f791def382a37ecc8149fcb17cbd0dfd9cde1698babbd0b -DIST mysql-5.1.41.tar.gz 23026814 RMD160 f99d17a2bb43fc45222c7015a3b65c6b4f686129 SHA1 04f7cf87419ca233c2508c2912d72548767b7e2c SHA256 5cb721db43a5f61710d8503813adef335cb1b738c7164e3d7d2a9681af8dbc16 -DIST mysql-5.1.42.tar.gz 22267547 RMD160 03be40ad07238d0b13d82b3e763f5263962e3bef SHA1 b16a787b61dfc6f57ff6fb723223598c6f529db1 SHA256 9b4fcc5137b3f6ab7107f6f84248aa8c74702be55a73470091c24b451fe79abe -DIST mysql-5.1.43.tar.gz 22319586 RMD160 51aa017edc165f13f2cb696ee210505b8f2a21ee SHA1 fff98e59f17487d646998662409bc894a422b7e9 SHA256 6e417c22c0ba91ba7fea15a6c7b63b581decd446b638ea5dac896cd5de90baf3 +DIST mysql-5.1.44.tar.gz 23400457 RMD160 f98d25322893b422ee708d683ee73ec9e17ad40a SHA1 265fbca02b2ef62926e2845d5fdf394298eb3206 SHA256 15dfccb34082a633a3f1793c21c7bf1432bf009a35acef0068885b7b68ecb540 DIST mysql-5.4.3-beta.tar.gz 21750728 RMD160 dc191579cc429441da7d20a1f50b25754fe37ad0 SHA1 daf96fb8adcdad23afed921727fe767ff0939711 SHA256 525e84f4c1fa135a492ead6945e03d91d5e72dc31397ca2d713b3124bbc3fcb5 DIST mysql-5.5.1-m2.tar.gz 21459964 RMD160 aa36e78efe6fdbfc020cd1599fa63dd9aa60e91b SHA1 6eb787a884523ea30b4a8b900a928a0caa159e3a SHA256 26e8d98ae2341b8ee292bc173531560011e0150da63f2d873fad191d8dbce081 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb @@ -34,6 +32,7 @@ DIST mysql-extras-20090908-1245Z.tar.bz2 658376 RMD160 ecbededc34710aacf1a9128ac DIST mysql-extras-20100131-0301Z.tar.bz2 945724 RMD160 7b6e5ac3d293dcb2f3821d3f205ee844241555d9 SHA1 e9369b788bf0f654ca097b70a9c8da5193942f89 SHA256 5d916d53cb242125f810763209dead5fd0a936add81904d14f71324a92be1f70 DIST mysql-extras-20100131-0616Z.tar.bz2 945566 RMD160 700191ce374392b58b34ee3f448ff9e416c0c165 SHA1 d90791ab0f0f2206f08de642a0fbeb96b2884a9f SHA256 f087303677a29abaf6bb5c63399c66398a5f80835d0da3f5c7525503c6fed46b DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70 +DIST mysql-extras-20100221-0021Z.tar.bz2 936455 RMD160 30bdf170c054f1593210ab523e43dc25cf108268 SHA1 bc0fb61692fbef6d6f09ec896951c7f5338bee4a SHA256 9fb417ef6e3f4dfe0dd61d0b4d6cd34ba088d0e2718b4c6e5d4cfe8fdab5c3c0 DIST percona-xtradb-1.0.4-8.tar.gz 1355440 RMD160 7705e9b1db9adc83f0511ef675897947265b70b6 SHA1 ce2cfab0ba93f69a77e8ad3d5570eff2b89bf899 SHA256 d700a5e7d868a27fd241c25f3e470c34bfb20a8f93c998b1df2a40d0b6f80b7b EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8 EBUILD mysql-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce @@ -50,12 +49,11 @@ EBUILD mysql-5.0.84.ebuild 5725 RMD160 58c7d75b55ae5fc34c22aba54910b4eec028b3e5 EBUILD mysql-5.0.87.ebuild 5493 RMD160 5bb7a8ee8b7be8ad0dedc8aa0ce345ec0811545a SHA1 381edf33eaf97dab9db8e55e3b50c900889db4af SHA256 9bc9832f276cd645f340b76b6be9f39f6fda8c5d25a78fc5b962da6709c6321d EBUILD mysql-5.0.88.ebuild 5510 RMD160 54ee1504d915fe127f6749b6780559edeeb400ae SHA1 f143c87b9d0eb750aa2f3ee5a92edddadacf92ca SHA256 dfd36038b23438a49502db1bf715968712aaa5a5de23c46430fe5e148e3e19a7 EBUILD mysql-5.0.90-r1.ebuild 5496 RMD160 1c1cfb2eb1bd2717ce35d81e562bc09aa5ca6f36 SHA1 6b0c0fb1be94430669517f1c279890ad15e64c5e SHA256 2477b7b77a86d6396684457f54510e14493a94f367151dec96ccfa416b181cc9 +EBUILD mysql-5.0.90-r2.ebuild 5488 RMD160 22d460e700cf0feae26b3293737800608c0c28ba SHA1 fa4bdc7b9ceb334c7ec43388f735444cbc19a0c0 SHA256 c15d082c72eadcd26b1b87b8111ce05097d5a5e1172471feae0d8401d478258e EBUILD mysql-5.0.90.ebuild 5493 RMD160 40d970335ca4767420bacdf3857f71d95e03399d SHA1 6a416627ca5503ee5895b3516e6c7013475a81b4 SHA256 4ceea2fd14dc7a6cabd0ae5fc3e663af8929d8ab923b7b7b70e121a577a854cc -EBUILD mysql-5.1.39.ebuild 5585 RMD160 9105f900fdad69a5cbf394f40904be8b7cb72e5a SHA1 1b74970bf8de0bebe3dc50481a0f323f2dca6782 SHA256 e34f80d36787ef168a6f8f3789bf440f4e8214ba1fd5c0bdafc83a5376522188 -EBUILD mysql-5.1.41.ebuild 5540 RMD160 9c4f9d83638371b5fbd4277e728707e1262afc28 SHA1 fe66ce54bff2abc56f11b550bab654b79e4b2193 SHA256 996304c04cb67e9b8512f549979e858616d6577eb294e8a44d6856949da1d0dd -EBUILD mysql-5.1.42.ebuild 6387 RMD160 a05c9d44f20a3677b00e69c39c00799061da9366 SHA1 8c2c0ae323d9f05aca3b92d2d8efd20c059e9899 SHA256 89453bc39f1e48b48e36f5a25a9e81f2e305db3573f77454e80b31df8e793ef5 -EBUILD mysql-5.1.43.ebuild 6313 RMD160 e6e4449840511e3f2271017eae0ad4a2a99c3338 SHA1 03c21696a91bca43f57113b01f967235f4294f9d SHA256 ba7f329b32d9e263956b76258bbb63f1b707ef229eea8a6c89a433aaea204ec2 +EBUILD mysql-5.1.39-r1.ebuild 6821 RMD160 5d47332472f0b5bafa27bded75d5f04ce4830c27 SHA1 ad1b191679be05b376dc4b5e5c2364d9e3373953 SHA256 949f9c1181b8870ce5f920a6479dc9b08bad607820894081abba379b9e5dbcd7 +EBUILD mysql-5.1.44.ebuild 6773 RMD160 1923a4a903a9e8ebbd6a9b96bdbab9e7d7c33865 SHA1 921074ee43b22f56eb8bfc1bfc105c517d003968 SHA256 429d75ae3825db89c69c56ab5ebf5dbe9a174e35e70e55713ccfeea69ea0388b EBUILD mysql-5.4.3_beta.ebuild 6548 RMD160 4979565cc3b924fd638e9a84379ad0d052ccf651 SHA1 badc1510e9b1beb36e5a90f1d5aa69b378a760cf SHA256 45cf51205429b782f23b51b6d149851027a6085b4b80341e23ab3eae337a94b0 EBUILD mysql-5.5.1_alpha_pre2.ebuild 6776 RMD160 0984335c429f8632f3ab8651fb41a03501d55d94 SHA1 e6160bc3ca42a6f8e5f3d5b8abc424ef7b5edc85 SHA256 212815319e62f0da22e754aae9944907d392cd2a4661a0776e67aefaa0c06c2a -MISC ChangeLog 98546 RMD160 f84320de601ceb1e762f8503fe8f9b59366adbef SHA1 9c9e06b67623c72e620215ebaeb6304a26719af6 SHA256 14c777710477223aee7e14d2708da9ddf0f3b57786850a0cfeaefaf4a575c28f -MISC metadata.xml 1044 RMD160 eca52715bc85512f787d2434ea048c7b6ada592a SHA1 20c62ad5fa9b0dac0a8a4d5e05ada56878e4bbd8 SHA256 eb1d58952bb1865a0fe14d57e830854852bcdc5ca7fe76eb0f11a67b52311504 +MISC ChangeLog 99064 RMD160 fd58c25cb8c77242b81e6df4483d483642993918 SHA1 be51b014c867f7d105b06a53bdf83a759ebcd4cf SHA256 4b5353a2dcc543511bb5253507e62e49beba83ad6eb895ea283173c9e83e1ed1 +MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574 diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml index 00f77e06deb8..983282a600ad 100644 --- a/dev-db/mysql/metadata.xml +++ b/dev-db/mysql/metadata.xml @@ -4,15 +4,17 @@ mysql Make tables contain up to 1.844E+19 rows - Add support for NDB clustering + Add support for NDB clustering (deprecated) Enables the community features from upstream. Build embedded server (libmysqld) Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition) Use LATIN1 encoding instead of UTF8 Raise the max index per table limit from 64 to 128 Install client programs only, no server + Add experimental support for PBXT storage engine Add support for statement profiling (requires USE=community). Deprecated option, removed in the 5.0 series - Add experimental support for XtraDB storage engine + Install upstream testsuites for end use. + Add experimental support for Percona's InnoDB replacement: XtraDB diff --git a/dev-db/mysql/mysql-5.1.41.ebuild b/dev-db/mysql/mysql-5.0.90-r2.ebuild similarity index 91% rename from dev-db/mysql/mysql-5.1.41.ebuild rename to dev-db/mysql/mysql-5.0.90-r2.ebuild index b72b0a6c293c..23b9de8c2d34 100644 --- a/dev-db/mysql/mysql-5.1.41.ebuild +++ b/dev-db/mysql/mysql-5.0.90-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.41.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r2.ebuild,v 1.1 2010/02/21 00:58:52 robbat2 Exp $ -MY_EXTRAS_VER="20100201-0104Z" +MY_EXTRAS_VER="20100221-0021Z" EAPI=2 inherit toolchain-funcs mysql @@ -19,14 +19,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar EPATCH_EXCLUDE='' DEPEND="|| ( >=sys-devel/gcc-4 >=sys-devel/gcc-apple-4 )" -RDEPEND="!media-sound/amarok[embedded]" +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='berkdb -cluster embedded extraengine perl ssl community' \ +# USE='berkdb cluster embedded extraengine perl ssl community' \ # FEATURES='test userpriv -usersandbox' \ # ebuild mysql-X.X.XX.ebuild \ # digest clean package @@ -123,7 +123,7 @@ src_test() { # expired/invalid. case ${PV} in 5.0.*|5.1.*) - for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + for t in openssl_1 rpl_openssl rpl_ssl ssl ssl_8k_key \ ssl_compress ssl_connect ; do \ mysql_disable_test \ "$t" \ @@ -136,12 +136,12 @@ src_test() { mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} # We run the test protocols seperately - make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" + make test-ns force="--force --vardir=${S}/mysql-test/var-ns" retstatus1=$? [[ $retstatus1 -eq 0 ]] || eerror "test-ns failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" + make test-ps force="--force --vardir=${S}/mysql-test/var-ps" retstatus2=$? [[ $retstatus2 -eq 0 ]] || eerror "test-ps failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" diff --git a/dev-db/mysql/mysql-5.1.43.ebuild b/dev-db/mysql/mysql-5.1.39-r1.ebuild similarity index 88% rename from dev-db/mysql/mysql-5.1.43.ebuild rename to dev-db/mysql/mysql-5.1.39-r1.ebuild index bdfc70d7d5e4..fb47b10c1bf0 100644 --- a/dev-db/mysql/mysql-5.1.43.ebuild +++ b/dev-db/mysql/mysql-5.1.39-r1.ebuild @@ -1,10 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.43.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.39-r1.ebuild,v 1.1 2010/02/21 00:58:52 robbat2 Exp $ -MY_EXTRAS_VER="20100201-0104Z" +MY_EXTRAS_VER="20100221-0021Z" EAPI=2 +XTRADB_VER="1.0.4-8" +PERCONA_VER="5.1.39-8" + inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass IUSE="$IUSE" @@ -149,20 +152,36 @@ src_test() { ;; esac + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} # We run the test protocols seperately - make -j1 test-unit + emake test-unit retstatus_unit=$? [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" retstatus_ns=$? [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" retstatus_ps=$? [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" diff --git a/dev-db/mysql/mysql-5.1.39.ebuild b/dev-db/mysql/mysql-5.1.39.ebuild deleted file mode 100644 index 177d074669fc..000000000000 --- a/dev-db/mysql/mysql-5.1.39.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.39.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $ - -MY_EXTRAS_VER="20100201-0104Z" -EAPI=2 - -XTRADB_VER="1.0.4-8" -PERCONA_VER="5.1.39-8" - -inherit toolchain-funcs mysql -# 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" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-4 >=sys-devel/gcc-apple-4 )" -RDEPEND="!media-sound/amarok[embedded]" - -# 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='berkdb -cluster embedded extraengine perl ssl community' \ -# FEATURES='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}" == "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=-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" - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus1 - local retstatus2 - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - - # archive_gis really sucks a lot, but it's only relevant for the - # USE=extraengines case - case ${PV} in - 5.0.42) - mysql_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)" == "big" ] && \ - mysql_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 issue - # was fixed. - case ${PV} in - 5.0.54|5.0.51*) - mysql_disable_test \ - "read_only" \ - "Broken in 5.0.51-54, output in wrong order" - ;; - esac - - # Ditto to read_only - [ "${PV}" == "5.0.51a" ] && \ - mysql_disable_test \ - "view" \ - "Broken in 5.0.51, output in wrong order" - - # x86-specific, OOM issue with some subselects on low memory servers - [ "${PV}" == "5.0.54" ] && \ - [ "${ARCH/x86}" != "${ARCH}" ] && \ - mysql_disable_test \ - "subselect" \ - "Testcase needs tuning on x86 for oom condition" - - # Broke with the YaSSL security issue that didn't affect Gentoo. - [ "${PV}" == "5.0.56" ] && \ - for t in openssl_1 rpl_openssl rpl_ssl ssl \ - ssl_8k_key ssl_compress ssl_connect ; do \ - mysql_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=41066 - [ "${PV}" == "5.0.72" ] && \ - mysql_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 regen - # ourselves. Alternatively, upstream should generate them with at least - # 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.*) - for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ - ssl_compress ssl_connect ; do \ - mysql_disable_test \ - "$t" \ - "These OpenSSL tests break due to expired certificates" - done - ;; - esac - - # create directories because mysqladmin might right out of order - mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} - - # We run the test protocols seperately - make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" - retstatus1=$? - [[ $retstatus1 -eq 0 ]] || eerror "test-ns failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" - retstatus2=$? - [[ $retstatus2 -eq 0 ]] || eerror "test-ps failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - failures="" - [[ $retstatus1 -eq 0 ]] || failures="test-ns" - [[ $retstatus2 -eq 0 ]] || failures="${failures} test-ps" - 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 -} diff --git a/dev-db/mysql/mysql-5.1.42.ebuild b/dev-db/mysql/mysql-5.1.44.ebuild similarity index 88% rename from dev-db/mysql/mysql-5.1.42.ebuild rename to dev-db/mysql/mysql-5.1.44.ebuild index 926b1d5587f9..712164f1d968 100644 --- a/dev-db/mysql/mysql-5.1.42.ebuild +++ b/dev-db/mysql/mysql-5.1.44.ebuild @@ -1,14 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.42.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.44.ebuild,v 1.1 2010/02/21 00:58:52 robbat2 Exp $ -MY_EXTRAS_VER="20100201-0104Z" +MY_EXTRAS_VER="20100221-0021Z" EAPI=2 -# Broken, does not compile -#XTRADB_VER="1.0.6-9" -#PERCONA_VER="5.1.42-9" - inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass IUSE="$IUSE" @@ -153,20 +149,36 @@ src_test() { ;; esac + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} # We run the test protocols seperately - make -j1 test-unit + emake test-unit retstatus_unit=$? [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" retstatus_ns=$? [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" retstatus_ps=$? [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"