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 <gentoo-commits+bounces-384210-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1R6aVi-0008Gp-Pi
for garchives@archives.gentoo.org; Thu, 22 Sep 2011 04:03:44 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6850021C06E
for <garchives@archives.gentoo.org>; Thu, 22 Sep 2011 04:03:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 9B92321C024
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Sep 2011 03:32:55 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 16D881B401B
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Sep 2011 03:32:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 60F8780042
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Sep 2011 03:32:54 +0000 (UTC)
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Message-ID: <520e3eabbc8b9ab3b074e99ad0e7c5c4bf526ded.jmbsvicetto@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.59.ebuild
X-VCS-Directories: dev-db/mysql/
X-VCS-Committer: jmbsvicetto
X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto
X-VCS-Revision: 520e3eabbc8b9ab3b074e99ad0e7c5c4bf526ded
Date: Thu, 22 Sep 2011 03:32:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 1c5e4f35a3a1ca2159aa7677201c12cf
commit: 520e3eabbc8b9ab3b074e99ad0e7c5c4bf526ded
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> ge=
ntoo <DOT> org>
AuthorDate: Thu Sep 22 03:32:48 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org=
>
CommitDate: Thu Sep 22 03:32:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D=
commit;h=3D520e3eab
Bumped mysql to the 5.1.59 release.
(Portage version: 2.2.0_alpha59/git/Linux x86_64, unsigned Manifest commi=
t)
---
dev-db/mysql/ChangeLog | 5 +
dev-db/mysql/Manifest | 24 +---
dev-db/mysql/mysql-5.1.59.ebuild | 261 ++++++++++++++++++++++++++++++++=
++++++
3 files changed, 269 insertions(+), 21 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 65a5145..b09219a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
=20
+*mysql-5.1.59 (22 Sep 2011)
+
+ 22 Sep 2011; <atlantis@gentoo.org> +mysql-5.1.59.ebuild:
+ Bumped mysql to the 5.1.59 release.
+
*mysql-5.5.15 (30 Jul 2011)
=20
30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 66aa3f8..3ff7b7d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f55=
92c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2=
291861e3e165200d6e98a69bd312c6c101ec
AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1=
40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5=
b175ffcc12a52e38772dd86274a8991ef50015af
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1=
babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468=
fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -8,6 +5,7 @@ AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec=
7307911cef SHA1 5845dca
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.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.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
@@ -19,27 +17,11 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c4=
01b8503f1c1bef4b50f7a781549
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.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac=
4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351f=
b7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
+EBUILD mysql-5.1.59.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9=
f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e=
2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83=
607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b=
7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83=
607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b=
7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858=
d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872=
a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858=
d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872=
a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794=
d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0d=
bb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7436 RMD160 854c902ae3f26132efca76f0935443ef41cf6173 SHA1=
c2c3c4fb731d32e9a7384bf749152f7bb10658f8 SHA256 9a101cc93a637e329e8027a7=
8ba5ee371279b2aaac42f59e47fb5e1b2f2bf6d0
+MISC ChangeLog 7563 RMD160 a3c96486c5f135422d760e8ff0b26fb4e8983253 SHA1=
e4196da9b41cb6c9bcba7146ccf58ce794b1a73c SHA256 236a66ce9dfe3f3602bf0e89=
3f641bd13e062e2205f7709fa629aa90d25f4629
MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d S=
HA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6=
a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOM3xjAAoJEC8ZTXQF1qEPr80P/0FR8SpDrRP4hauhvpx1799J
-Z+n8otn2Eay7yQ1fU5IvNzVbksu4s3qSgFtOdN5CJ7Bb1JD3Af1bu0fJ2o6fEZ+I
-ESICNMOvQPeDPnTQytIJfcQ1qQhuol5ExN7y5dTMPFQU8hzoBPKFICzEhfdKKFau
-EaS/AXzTO+cWKTiHxC6PF3k3McZdKbjJkRRKhdV5vvHHIOwxnt+B9fxyhhApCgFE
-CXxB8tzcE6KQGNwNJjuk8UnY/Zo/yvl5fY6n6CvQAs0sMMSWwziR1urNGlmAfoOz
-b5ACLdcC6yNpeFQMCY8WlJoyszZ6gNWM2HfnVGsFsr9+Oab/pJQK/rf4ajsz/N2H
-it9Ypl/qq+DmRZmXmCDrg8v7cxDnikPGv8O+i2ZPovEnn1vovF9vrlwLLc0OpR1x
-2tYy0QuwoAQRmfac0Q0Z4smpEg1iPpahz6isnIEk68r3QYzEn5QBKLsn3fpS7iCd
-X225zw5nrQ5psxoy4PUkXY94yyoO7ugKQ78nCjH6UjRAgToGj60vW95vTnInqhSQ
-x0toUOzCpDz06FYA9DSTC4oZOEJO3N50OxH5wG3NXjDnIC65GfHqq3nRzr3pa6/k
-66PdW1JEbjpgw2FDDktxdSIKGhUhyLsnNaUpEwviDC4fakWEBQBRjBpdAoOY1LiN
-UByXUmuW3m6jGXwgWTLi
-=3DuzJg
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.1.59.ebuild b/dev-db/mysql/mysql-5.1.59=
.ebuild
new file mode 100644
index 0000000..3db6725
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.59.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 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"2"
+
+MY_EXTRAS_VER=3D"20110721-0450Z"
+# 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
+}