summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-01-25 22:54:55 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-01-25 22:54:55 +0000
commitf32bd7751131041fc696535b07a33fbf3e5d1b3b (patch)
tree6f57be96e64f4d932607bc755468967cd4c813d7
parentOutput a QA warning when the autotools functions are used outside of (diff)
downloadhistorical-f32bd7751131041fc696535b07a33fbf3e5d1b3b.tar.gz
historical-f32bd7751131041fc696535b07a33fbf3e5d1b3b.tar.bz2
historical-f32bd7751131041fc696535b07a33fbf3e5d1b3b.zip
Disable the subselect testcase on x86.
Package-Manager: portage-2.1.4
-rw-r--r--dev-db/mysql/ChangeLog5
-rw-r--r--dev-db/mysql/Manifest16
-rw-r--r--dev-db/mysql/mysql-5.0.54.ebuild8
3 files changed, 19 insertions, 10 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 456c750b8fc0..adcdab99f44a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/mysql
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.438 2008/01/25 08:55:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.439 2008/01/25 22:54:55 robbat2 Exp $
+
+ 25 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.54.ebuild:
+ Disable the subselect testcase on x86.
25 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.54.ebuild:
Bump the mysql-extras.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9deb11bdb731..ba0e139ec3c9 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -86,14 +86,14 @@ EBUILD mysql-5.0.44.ebuild 2421 RMD160 818b644ac5d77a7b103263f4c4763edd11dbbd06
MD5 6cfbec60b5fe94da511d08d3dda8bf55 mysql-5.0.44.ebuild 2421
RMD160 818b644ac5d77a7b103263f4c4763edd11dbbd06 mysql-5.0.44.ebuild 2421
SHA256 43f1119475c02fa856a6b038c9c7318cce5adce8ed4514485b98088db7fa423a mysql-5.0.44.ebuild 2421
-EBUILD mysql-5.0.54.ebuild 2079 RMD160 a112108f2a871a7ba0e6c202f3ef9a3403e9f44b SHA1 2e07916259e49bd96a36889316f078a232291fbe SHA256 b6c6f0951269a1c01927c86d703d10e58ea536586665db05091373028b6d6f71
-MD5 5ec5b262c122b55624fc48299dcf5de5 mysql-5.0.54.ebuild 2079
-RMD160 a112108f2a871a7ba0e6c202f3ef9a3403e9f44b mysql-5.0.54.ebuild 2079
-SHA256 b6c6f0951269a1c01927c86d703d10e58ea536586665db05091373028b6d6f71 mysql-5.0.54.ebuild 2079
-MISC ChangeLog 85323 RMD160 af3dae5b92fc0029cb64768b694647c9b5091c8c SHA1 aabc6b1c5a9c82223137be9119bf6bb5ce4728b6 SHA256 1d4385cc837c09137d37eb6c3ccd6d3f869f036a4f43613ca8dc3c7112ba2642
-MD5 3e530b8ecdde61d7f2044cb1bbe12b21 ChangeLog 85323
-RMD160 af3dae5b92fc0029cb64768b694647c9b5091c8c ChangeLog 85323
-SHA256 1d4385cc837c09137d37eb6c3ccd6d3f869f036a4f43613ca8dc3c7112ba2642 ChangeLog 85323
+EBUILD mysql-5.0.54.ebuild 2245 RMD160 30af43e4b87cc7a46696074a1105380e71069074 SHA1 3e9ac031fb63995692fb3b47a8e4e1fbf1aa9317 SHA256 a713dc5b31a31c18199b888835d68ac7956ab64dde8b2b1df696a3dce63c3b4f
+MD5 e21f7271da0f9185fdb71db700520375 mysql-5.0.54.ebuild 2245
+RMD160 30af43e4b87cc7a46696074a1105380e71069074 mysql-5.0.54.ebuild 2245
+SHA256 a713dc5b31a31c18199b888835d68ac7956ab64dde8b2b1df696a3dce63c3b4f mysql-5.0.54.ebuild 2245
+MISC ChangeLog 85439 RMD160 f037753abea6e786d8a1224e1259b61120f37db4 SHA1 75bc8c993f0ec42441a6cb095eb3aac92a346db7 SHA256 d59c7eadeb50302ccc31db34a0262af4aaa1a01f88ed993e13c35412aba95529
+MD5 b93fb05158656075fb54510da2f81e75 ChangeLog 85439
+RMD160 f037753abea6e786d8a1224e1259b61120f37db4 ChangeLog 85439
+SHA256 d59c7eadeb50302ccc31db34a0262af4aaa1a01f88ed993e13c35412aba95529 ChangeLog 85439
MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
diff --git a/dev-db/mysql/mysql-5.0.54.ebuild b/dev-db/mysql/mysql-5.0.54.ebuild
index 1cd9b7db897f..5c52804218db 100644
--- a/dev-db/mysql/mysql-5.0.54.ebuild
+++ b/dev-db/mysql/mysql-5.0.54.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.2 2008/01/25 08:55:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.3 2008/01/25 22:54:55 robbat2 Exp $
MY_EXTRAS_VER="20080124"
SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
@@ -48,6 +48,12 @@ src_test() {
"read_only" \
"Broken in 5.0.54, output in wrong order"
+ [ "${PV}" == "5.0.54" ] && \
+ [ "${ARCH/x86}" != "${ARCH}" ] && \
+ mysql_disable_test \
+ "subselect" \
+ "Testcase needs tuning on x86 for oom condition"
+
# We run the test protocols seperately
make -j1 test-ns force=--force
retstatus1=$?