The cluster tests fail when run as root, so block them when FEATURES=-userpriv.

Package-Manager: portage-2.1.2.3

3 files changed, 28 insertions, 25 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index e841bb6bc668..d797e7399ee5 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.395 2007/04/15 20:53:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.396 2007/04/16 02:36:33 robbat2 Exp $
+
+  16 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.38.ebuild:
+  The cluster tests fail when run as root, so block them when FEATURES=-userpriv.
 
   15 Apr 2007; Raúl Porcel <armin76@gentoo.org> mysql-5.0.38.ebuild:
   ia64 stable wrt security bug 171934
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 755a091e09d7..4c3bf616e8dc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -55,14 +55,14 @@ EBUILD mysql-5.0.34.ebuild 2053 RMD160 b6e4417d4645dfafceab4219247e6b4ecebadcfe
 MD5 62685ebdf91e30eb7a80d2972d608bc7 mysql-5.0.34.ebuild 2053
 RMD160 b6e4417d4645dfafceab4219247e6b4ecebadcfe mysql-5.0.34.ebuild 2053
 SHA256 2359fda98097cdc84e2254601b6cc8bdbb2650149a8bdc6a563d373cfac58a55 mysql-5.0.34.ebuild 2053
-EBUILD mysql-5.0.38.ebuild 2700 RMD160 fa2121bb5fb4c1fdc9bf592a30b72f2b85e63028 SHA1 2624f55bd8e15833e17517e7cfd1e4f155bb82cc SHA256 3d393b09bb7f753324f28146fb03aee41c650268c9b0a6d1c2cc1000b0652c5c
-MD5 bff14eddf440287fd978f7a791a862af mysql-5.0.38.ebuild 2700
-RMD160 fa2121bb5fb4c1fdc9bf592a30b72f2b85e63028 mysql-5.0.38.ebuild 2700
-SHA256 3d393b09bb7f753324f28146fb03aee41c650268c9b0a6d1c2cc1000b0652c5c mysql-5.0.38.ebuild 2700
-MISC ChangeLog 79787 RMD160 76eedbcaf03ee2f6a05c614b75ae59ad006ba9f5 SHA1 683fc6d1350844f335bc4ce598540c97c734cfd1 SHA256 ea737cbf6c438897ca333db38af0884a09acc414662b3d89c21c2278ce46fe89
-MD5 a50d30e2521398b93a0d2e5cccc47a01 ChangeLog 79787
-RMD160 76eedbcaf03ee2f6a05c614b75ae59ad006ba9f5 ChangeLog 79787
-SHA256 ea737cbf6c438897ca333db38af0884a09acc414662b3d89c21c2278ce46fe89 ChangeLog 79787
+EBUILD mysql-5.0.38.ebuild 2667 RMD160 28669804e3b7c2f1d4e3ec4eb2f938ca1a66e0f8 SHA1 b17b347fe9a4202146fbc368aa1a2f7f4100df9b SHA256 6228fc2afc688a3e08bac2961ecfe4b808c6cd13dce21065d859a89007fcfdf1
+MD5 34f4682a3037247f8ee41917d0a10f29 mysql-5.0.38.ebuild 2667
+RMD160 28669804e3b7c2f1d4e3ec4eb2f938ca1a66e0f8 mysql-5.0.38.ebuild 2667
+SHA256 6228fc2afc688a3e08bac2961ecfe4b808c6cd13dce21065d859a89007fcfdf1 mysql-5.0.38.ebuild 2667
+MISC ChangeLog 79944 RMD160 4e4669e5cd13a0ee15a6b474dd589fadada97b4c SHA1 b36354d919873af48bf744c2782b8d7fd0de7d40 SHA256 1a16b444ac02a2af8ce83bbb204340ad68a3e66d6e3d28cd84fb96281887c751
+MD5 634d7a9b41407ae75ae09bf4ec87f01b ChangeLog 79944
+RMD160 4e4669e5cd13a0ee15a6b474dd589fadada97b4c ChangeLog 79944
+SHA256 1a16b444ac02a2af8ce83bbb204340ad68a3e66d6e3d28cd84fb96281887c751 ChangeLog 79944
 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.38.ebuild b/dev-db/mysql/mysql-5.0.38.ebuild
index c3ff369b8a6d..9d63ccad7460 100644
--- a/dev-db/mysql/mysql-5.0.38.ebuild
+++ b/dev-db/mysql/mysql-5.0.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.38.ebuild,v 1.5 2007/04/15 20:53:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.38.ebuild,v 1.6 2007/04/16 02:36:33 robbat2 Exp $
 
 MY_EXTRAS_VER="20070415"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -32,23 +32,23 @@ src_test() {
 			mysql_disable_test	"im_options_set"		"fails as root"
 			mysql_disable_test	"im_options_unset"		"fails as root"
 			mysql_disable_test	"im_utils"				"fails as root"
+			
+			# As of 5.0.38, these work with the sandbox
+			# but they break if you are root
+			for t in \
+			loaddata_autocom_ndb \
+			ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
+			ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
+			ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
+			ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
+			ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
+			ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb \
+			mysql_upgrade
+			do
+				mysql_disable_test	"${t}"	"fails as root"
+			done
 		fi
 
-		# As of 5.0.38, these work with the sandbox
-		# Tested by robbat2, on ppc64-32ul and amd64.
-		##for t in \
-		##loaddata_autocom_ndb \
-		##ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
-		##ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
-		##ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
-		##ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
-		##ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
-		##ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb \
-		##mysql_upgrade
-		##do
-		##	mysql_disable_test	"${t}"	"fails with sandbox enabled"
-		##done
-
 		# Both of these seem to work as of 5.0.38
 		##use "extraengine" && mysql_disable_test "federated" "fails with extraengine USE"
 		##use "ssl" && mysql_disable_test "ssl_des" "fails requiring PEM passphrase"