summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mysql')
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest4
-rw-r--r--dev-db/mysql/mysql-5.1.61.ebuild8
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index eb0f87ad2b91..396591dc1e0e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mysql
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.596 2012/01/31 09:33:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.597 2012/01/31 20:23:03 robbat2 Exp $
+
+ 31 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.61.ebuild:
+ Bug #401673: False positive on federated.federated_plugin test with
+ USE=-extraengine.
*mysql-5.5.20 (31 Jan 2012)
*mysql-5.1.61 (31 Jan 2012)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 18abe544b667..49ecc06a9cee 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -42,9 +42,9 @@ EBUILD mysql-5.1.56.ebuild 8663 RMD160 402d77055994f679c07ce8adf8adfcc25d062297
EBUILD mysql-5.1.57.ebuild 8719 RMD160 2b3573c5c3480a74a69e6be8c3c6c0b2e79aec98 SHA1 1e426a3648b7e2371399bbf4505d84fa22db59a0 SHA256 0b0dec0329899e46be03c6535fcc365d8105d697cd4ce33ba6168e44427022ce
EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 b24dfc0ef0585fff9c90be233e38d0a18a8729e1 SHA1 44e88a0c9b7b8274e01db08fbd59264441af879a SHA256 5bcf90202f0feeea590291aacd639a5e15a2f1f4e8b4ad02c67b72e70b00aea6
EBUILD mysql-5.1.59.ebuild 8735 RMD160 6c6414519d83c587e0cd9d784f2421d8aefde9be SHA1 44c8a608cb92777dc990742a562d8433ab1d3798 SHA256 3d883c45c0b74802b85952ecafff61aeabf7213ce3a9ed2e3f68075270848eb1
-EBUILD mysql-5.1.61.ebuild 8731 RMD160 3cf5021ded02818c2c38a5903411d24fe2031455 SHA1 6a285ed90d94413eb48e5d9ed62753ecf9882e98 SHA256 1e1b9d7ed1a710ba8461eb8668dd3beec5d831ec29bb29e04b1dfe9b1940a832
+EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
EBUILD mysql-5.5.19.ebuild 4234 RMD160 ab95178bb615cfdf73d6085b424c2127e45640e0 SHA1 d5ec9a7dde6788c6cb1a189f45d02e532ce5861c SHA256 b178e2dbcb0afb843b53cf2c0148dfc52a1909141435d43fd32d4e4dfee94e3a
EBUILD mysql-5.5.20.ebuild 4230 RMD160 83ff016f9baa86b9d39501c8bd7dda9069f9b2db SHA1 2d666a87cd4c4723c9e4882702504def6498781d SHA256 bd74a5f69a5c8ec88fb25ec9aa1dd61875d299412392b6b7581d8133f64b054e
-MISC ChangeLog 6501 RMD160 a25ba1fb62872826f4b92a6b5879e7270251ff29 SHA1 cb9a5442153348badfe85c0deed87596e6ac0a62 SHA256 2730bdc5f07dd5ae3ccf431023d5733e53e5700df794762419400746ffff36aa
+MISC ChangeLog 6666 RMD160 d78956aacc090055cfb45e7ded511d5649820eba SHA1 0bbc20745cbb97fdc0cf96ad8a852fac4b75f533 SHA256 2bf21ad77a84b5ef1bc7e17f6eb6ff93bd2647e0abc45b15472d79aedb50da4d
MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd
MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1
diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
index 7e9d80ff0164..9cdf8c2786ed 100644
--- a/dev-db/mysql/mysql-5.1.61.ebuild
+++ b/dev-db/mysql/mysql-5.1.61.ebuild
@@ -1,6 +1,6 @@
# 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.61.ebuild,v 1.1 2012/01/31 09:33:11 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 $
EAPI="4"
@@ -217,11 +217,15 @@ src_test() {
done
fi
- # bug 332565
if ! use extraengine ; then
+ # bug 332565
for t in main.range ; do
mysql-v2_disable_test $t "Test $t requires USE=extraengine"
done
+ # bug 401673
+ for t in federated.federated_plugin ; do
+ mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+ done
fi
# create directories because mysqladmin might make out of order