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 1SEV1R-0007Mg-QE for garchives@archives.gentoo.org; Mon, 02 Apr 2012 00:21:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F138FE0B62; Mon, 2 Apr 2012 00:21:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B1945E0B62 for ; Mon, 2 Apr 2012 00:21:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC0121B4021 for ; Mon, 2 Apr 2012 00:21:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B2BD6E542C for ; Mon, 2 Apr 2012 00:21:01 +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: <1333316864.fd950345d9b322507c93bd7223b16af5ccd5e28e.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/Manifest dev-db/mysql/mysql-5.0.92.ebuild dev-db/mysql/mysql-5.0.96.ebuild dev-db/mysql/mysql-5.1.62.ebuild dev-db/mysql/mysql-5.5.22.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fd950345d9b322507c93bd7223b16af5ccd5e28e X-VCS-Branch: master Date: Mon, 2 Apr 2012 00:21:01 +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: 81e6e283-794f-412f-9179-ff4373709b11 X-Archives-Hash: b1070df716ee59465b54918193025dba commit: fd950345d9b322507c93bd7223b16af5ccd5e28e Author: Robin H. Johnson orbis-terrarum net> AuthorDate: Sun Apr 1 21:47:44 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 1 21:47:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Dfd950345 Updated versions, with patchsets, and pass tests (5.0.96 is a upgrade-pat= h release only, many tests were disabled. Should not be used in productio= n). (Portage version: 2.2.0_alpha93/git/Linux x86_64, RepoMan options: --forc= e, unsigned Manifest commit) --- dev-db/mysql/Manifest | 9 +- dev-db/mysql/mysql-5.0.92.ebuild | 8 +- .../{mysql-5.0.92.ebuild =3D> mysql-5.0.96.ebuild} | 31 ++++- .../{mysql-5.0.92.ebuild =3D> mysql-5.1.62.ebuild} | 137 ++++++++++++= +++----- dev-db/mysql/mysql-5.5.22.ebuild | 2 +- 5 files changed, 137 insertions(+), 50 deletions(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 4b7d280..5afc44a 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -4,7 +4,9 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6= ecaa4e1e4c SHA1 babc799 AUX my.cnf-5.1 4308 RMD160 9f833986c42b9879881f3b6f233e7ffc8f16d6ec SHA1= 80b86608e508dfc348ec7976f6d42a2331c7b150 SHA256 3718047d2e07b63668fd0ea9= 0eea8e3284b7a2621c054c6d999a9745b119ff97 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 = d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20= 074fdb59554635f8b1fd17e088d82208e611c12 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f4= 7dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd= 6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55 +DIST mysql-5.0.96.tar.gz 22686667 RMD160 b7c500f5aa82ab7189acc3c184db256= 16645e3ec SHA1 b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8 SHA256 4385381477= 5158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a= 29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c642428= 2e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 +DIST mysql-5.1.62.tar.gz 24503313 RMD160 c5720deee2b04a40a20f56a3b305b37= fecb343fe SHA1 06c7b3742f21fee6faf46224de2221230f943f63 SHA256 97c07b2478= e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 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.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c8= 2cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42= bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd @@ -12,14 +14,17 @@ DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9= eac4f6a4f25d7e8836edcaaee70 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-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d46= 1f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SH= A256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 +DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef0= 6fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SH= A256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f= 7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71f= f3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3= ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 = e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c -EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714= 926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11e= a60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947 +EBUILD mysql-5.0.92.ebuild 6498 RMD160 c4c093dcab2b00c754069e3bd5f931056= a4d055a SHA1 bc066addd75e3df51e972a93f08c83f5fd9c6535 SHA256 ff447b9379cb= dfbe0310cff1248cfd9eb829c325fd6b3d54da8caae0d0be4d0d +EBUILD mysql-5.0.96.ebuild 7192 RMD160 87650fdb019e313dcdcff83eb064c100f= 811bf95 SHA1 6211a192ca7a12189bc6a4b1671142436b93e740 SHA256 16bd83cacc71= 1ebc91dbc041db0a8b87692764c83d5d54ddc3cb1d0a99874ed2 EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44= a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd9= 4314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708 +EBUILD mysql-5.1.62.ebuild 8888 RMD160 5f35028da02dddcba36f9e7a22ad508b3= 8192a85 SHA1 7605b7e82df44e9790a9c643a5f221cc2730adc6 SHA256 01421f2f6a9e= e7c0ea80c520cc9d207f0021fcdf8adb0141cfeb96cf69fb07c0 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac48040687= 14b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f6= 8baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191= 340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8= effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191= 340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8= effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3 -EBUILD mysql-5.5.22.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191= 340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8= effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3 +EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9ef= f56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b426= 7b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704= 627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f3= 08eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1= 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1= 883736148d3ab3692a4b4c42f0483de3a37ddea3 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 S= HA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba= 9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503 diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92= .ebuild index 7906c6c..d252f9e 100644 --- a/dev-db/mysql/mysql-5.0.92.ebuild +++ b/dev-db/mysql/mysql-5.0.92.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.0.90-r1.ebuild,v= 1.1 2010/01/31 06:20:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.= 2 2012/01/08 23:40:20 jmbsvicetto Exp $ =20 MY_EXTRAS_VER=3D"live" -EAPI=3D2 -# 5.0.91 tarball has wrong version number in the directory. -#MY_SOURCEDIR=3D'mysql-5.0.90' +EAPI=3D"4" =20 inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.96= .ebuild similarity index 87% copy from dev-db/mysql/mysql-5.0.92.ebuild copy to dev-db/mysql/mysql-5.0.96.ebuild index 7906c6c..ff19fe3 100644 --- a/dev-db/mysql/mysql-5.0.92.ebuild +++ b/dev-db/mysql/mysql-5.0.96.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.0.90-r1.ebuild,v= 1.1 2010/01/31 06:20:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.= 2 2012/01/08 23:40:20 jmbsvicetto Exp $ =20 -MY_EXTRAS_VER=3D"live" -EAPI=3D2 -# 5.0.91 tarball has wrong version number in the directory. -#MY_SOURCEDIR=3D'mysql-5.0.90' +MY_EXTRAS_VER=3D"20120401-2131Z" +EAPI=3D"4" =20 inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass @@ -164,11 +162,30 @@ src_test() { for t in archive archive_gis archive-big \ federated_archive mysqldump-max \ ; do - mysql_disable_test $t "Broken in 5.0.91" + mysql_disable_test $t "Broken in $PV" + done + ;; + 5.0.96) + for t in \ + client_xml compress connect ctype_recoding drop \ + federated grant information_schema \ + information_schema_db innodb lowercase_table \ + lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \ + mysqlcheck mysqldump-max mysqldump mysqldump_restore \ + mysqlshow ps ps_1general rename rpl000009 rpl_ddl \ + rpl_delete_all rpl_drop_db rpl_dual_pos_advance \ + rpl_error_ignored_table rpl_filter_tables_not_exist \ + rpl_replicate_do rpl_trigger_not_windows select \ + show_check sp system_mysql_db system_mysql_db_fix30020 \ + system_mysql_db_fix40123 view \ + ; do + mysql_disable_test $t "Broken in $PV" done ;; esac =20 + + # create directories because mysqladmin might make out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} =20 diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.1.62= .ebuild similarity index 58% copy from dev-db/mysql/mysql-5.0.92.ebuild copy to dev-db/mysql/mysql-5.1.62.ebuild index 7906c6c..90ca29a 100644 --- a/dev-db/mysql/mysql-5.0.92.ebuild +++ b/dev-db/mysql/mysql-5.1.62.ebuild @@ -1,28 +1,44 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.0.90-r1.ebuild,v= 1.1 2010/01/31 06:20:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.= 2 2012/01/31 20:23:03 robbat2 Exp $ =20 -MY_EXTRAS_VER=3D"live" -EAPI=3D2 -# 5.0.91 tarball has wrong version number in the directory. -#MY_SOURCEDIR=3D'mysql-5.0.90' +EAPI=3D"4" + +MY_EXTRAS_VER=3D"20120401-2131Z" +# 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 =20 -inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass IUSE=3D"$IUSE" =20 # 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-maco= s ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-= solaris" =20 # When MY_EXTRAS is bumped, the index should be revised to exclude these= . +# This is often broken still EPATCH_EXCLUDE=3D'' =20 -DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 )" -RDEPEND=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}" =20 # 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 +} =20 # Official test instructions: # USE=3D'berkdb -cluster embedded extraengine perl ssl community' \ @@ -42,6 +58,7 @@ src_test() { 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 @@ -54,12 +71,12 @@ src_test() { # USE=3Dextraengines case case ${PV} in 5.0.42) - mysql_disable_test "archive_gis" "Totally broken in 5.0.42" + mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" ;; =20 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) [ "$(tc-endian)" =3D=3D "big" ] && \ - mysql_disable_test \ + mysql-v2_disable_test \ "archive_gis" \ "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" ;; @@ -69,7 +86,7 @@ src_test() { # was fixed. case ${PV} in 5.0.54|5.0.51*) - mysql_disable_test \ + mysql-v2_disable_test \ "read_only" \ "Broken in 5.0.51-54, output in wrong order" ;; @@ -77,14 +94,14 @@ src_test() { =20 # Ditto to read_only [ "${PV}" =3D=3D "5.0.51a" ] && \ - mysql_disable_test \ + mysql-v2_disable_test \ "view" \ "Broken in 5.0.51, output in wrong order" =20 # x86-specific, OOM issue with some subselects on low memory servers [ "${PV}" =3D=3D "5.0.54" ] && \ [ "${ARCH/x86}" !=3D "${ARCH}" ] && \ - mysql_disable_test \ + mysql-v2_disable_test \ "subselect" \ "Testcase needs tuning on x86 for oom condition" =20 @@ -92,7 +109,7 @@ src_test() { [ "${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_disable_test \ + mysql-v2_disable_test \ "$t" \ "OpenSSL tests broken on 5.0.56" done @@ -101,7 +118,7 @@ src_test() { # Upstream bug 41066 # http://bugs.mysql.com/bug.php?id=3D41066 [ "${PV}" =3D=3D "5.0.72" ] && \ - mysql_disable_test \ + mysql-v2_disable_test \ "status2" \ "Broken in 5.0.72, new test is broken, upstream bug #41066" =20 @@ -121,58 +138,104 @@ src_test() { # mysql-test/std_data/untrusted-cacert.pem is MEANT to be # expired/invalid. case ${PV} in - 5.0.*|5.1.*) + 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 ; do \ - mysql_disable_test \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ + mysql-v2_disable_test \ "$t" \ "These OpenSSL tests break due to expired certificates" done ;; esac =20 - # These are also failing in MySQL 5.0 for now, and are believed to be + # These are also failing in MySQL 5.1 for now, and are believed to be # false positives: # - # main.mysql_comment, main.mysql_upgrade: + # 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.0.*) - for t in main.mysql_client_test main.mysql_comments main.mysql_upgrad= e; do - mysql_disable_test "$t" "False positives in Gentoo" + 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 =20 use profiling && use community \ - || mysql_disable_test main.profiling \ + || mysql-v2_disable_test main.profiling \ "Profiling test needs profiling support" =20 if [ "${PN}" =3D=3D "mariadb" ]; then for t in \ parts.part_supported_sql_func_ndb \ parts.partition_auto_increment_ndb ; do - mysql_disable_test $t "ndb not supported in mariadb" + mysql-v2_disable_test $t "ndb not supported in mariadb" done fi =20 - case $PV in - 5.0.91) - for t in archive archive_gis archive-big \ - federated_archive mysqldump-max \ + # 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_disable_test $t "Broken in 5.0.91" - done - ;; - esac + mysql-v2_disable_test $t "tests broken in xtradb" + done + fi + + if ! use extraengine ; then + # bug 332565 + for t in main.range ; do + mysql-v2_disable_test $t "Test $t requires USE=3Dextraengine" + done + # bug 401673 + for t in federated.federated_plugin ; do + mysql-v2_disable_test $t "Test $t requires USE=3Dextraengine (Need f= ederated engine)" + done + fi =20 # create directories because mysqladmin might make out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} =20 # 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" @@ -183,10 +246,14 @@ src_test() { [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" =20 + # 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" diff --git a/dev-db/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22= .ebuild index 18ef035..1dad757 100644 --- a/dev-db/mysql/mysql-5.5.22.ebuild +++ b/dev-db/mysql/mysql-5.5.22.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D"4" =20 -MY_EXTRAS_VER=3D"20111118-2347Z" +MY_EXTRAS_VER=3D"20120401-2131Z" MY_PV=3D"${PV//_alpha_pre/-m}" MY_PV=3D"${MY_PV//_/-}" =20