Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Tue, 31 Jan 2012 09:29:39
Message-Id: 6793ce9e3a9a78606d98f6c0972243a4feb19acc.robbat2@gentoo
1 commit: 6793ce9e3a9a78606d98f6c0972243a4feb19acc
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 09:29:20 2012 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 09:29:20 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6793ce9e
7
8 Version bump, passes all tests.
9
10 (Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
11
12 ---
13 dev-db/mysql/ChangeLog | 9 +-
14 dev-db/mysql/Manifest | 4 +
15 dev-db/mysql/mysql-5.1.61.ebuild | 261 ++++++++++++++++++++++++++++++++++++++
16 dev-db/mysql/mysql-5.5.20.ebuild | 129 +++++++++++++++++++
17 4 files changed, 402 insertions(+), 1 deletions(-)
18
19 diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
20 index 5e8cd83..1a52010 100644
21 --- a/dev-db/mysql/ChangeLog
22 +++ b/dev-db/mysql/ChangeLog
23 @@ -1,7 +1,14 @@
24 # ChangeLog for dev-db/mysql
25 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
26 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 # $Header: $
28
29 +*mysql-5.1.61 (31 Jan 2012)
30 +*mysql-5.5.20 (31 Jan 2012)
31 +
32 + 31 Jan 2012; Robin H. Johnson <robbat2@g.o> +mysql-5.1.61.ebuild,
33 + +mysql-5.5.20.ebuild:
34 + Version bump, passes all tests.
35 +
36 20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
37 mysql-5.1.58-r1.ebuild, mysql-5.5.10.ebuild, mysql-5.5.12.ebuild,
38 mysql-5.5.14.ebuild, mysql-5.5.15.ebuild:
39
40 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
41 index d995128..bd02b12 100644
42 --- a/dev-db/mysql/Manifest
43 +++ b/dev-db/mysql/Manifest
44 @@ -7,6 +7,7 @@ DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef0
45 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
46 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
47 DIST mysql-5.1.60.tar.gz 24408313 RMD160 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a SHA1 26ae4d2f7e7066644eb343ab519cbef1626069c2 SHA256 2829fcb7393bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53
48 +DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
49 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
50 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
51 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
52 @@ -15,6 +16,7 @@ DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be
53 DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
54 DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
55 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
56 +DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
57 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
58 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
59 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
60 @@ -25,6 +27,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
61 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
62 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
63 EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
64 +EBUILD mysql-5.1.61.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
65 EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
66 EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
67 EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
68 @@ -33,6 +36,7 @@ EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46
69 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
70 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
71 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
72 +EBUILD mysql-5.5.20.ebuild 4234 RMD160 26eaee55ff2e336fdad5de7a8833b845c7448bec SHA1 b1450bb0baa3064d8a442b240a2f63e9703254d7 SHA256 39d742b618f84374097279fc3ce11017b0a2dd613046ba262c5dbe07b65cd2dc
73 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
74 MISC ChangeLog 8557 RMD160 bb446dda1050e319c96c6a38ce32308345429b71 SHA1 4f5721841f563f980e0eda3a1e57163daad52de8 SHA256 07b9af8932bb03c3412e353086da17c11c8a271347ec89264466303857bb78d9
75 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
76
77 diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
78 new file mode 100644
79 index 0000000..0c85a89
80 --- /dev/null
81 +++ b/dev-db/mysql/mysql-5.1.61.ebuild
82 @@ -0,0 +1,261 @@
83 +# Copyright 1999-2012 Gentoo Foundation
84 +# Distributed under the terms of the GNU General Public License v2
85 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
86 +
87 +EAPI="4"
88 +
89 +MY_EXTRAS_VER="20111118-2347Z"
90 +# PBXT
91 +PBXT_VERSION='1.0.11-6-pre-ga'
92 +# XtraDB
93 +PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
94 +
95 +# Build type
96 +BUILD="autotools"
97 +
98 +inherit toolchain-funcs mysql-v2
99 +
100 +# only to make repoman happy. it is really set in the eclass
101 +IUSE="$IUSE"
102 +
103 +# REMEMBER: also update eclass/mysql*.eclass before committing!
104 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
105 +
106 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
107 +# This is often broken still
108 +EPATCH_EXCLUDE=''
109 +
110 +# Most of these are in the eclass
111 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
112 + >=sys-devel/libtool-2.2.10"
113 +RDEPEND="${RDEPEND}"
114 +
115 +# Please do not add a naive src_unpack to this ebuild
116 +# If you want to add a single patch, copy the ebuild to an overlay
117 +# and create your own mysql-extras tarball, looking at 000_index.txt
118 +src_prepare() {
119 + sed -i \
120 + -e '/^noinst_PROGRAMS/s/basic-t//g' \
121 + "${S}"/unittest/mytap/t/Makefile.am
122 + mysql-v2_src_prepare
123 +}
124 +
125 +# Official test instructions:
126 +# USE='berkdb -cluster embedded extraengine perl ssl community' \
127 +# FEATURES='test userpriv -usersandbox' \
128 +# ebuild mysql-X.X.XX.ebuild \
129 +# digest clean package
130 +src_test() {
131 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
132 + # localhost. Also causes weird failures.
133 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
134 +
135 + emake check || die "make check failed"
136 + if ! use "minimal" ; then
137 + if [[ $UID -eq 0 ]]; then
138 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
139 + fi
140 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
141 + cd "${S}"
142 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
143 + local retstatus_unit
144 + local retstatus_ns
145 + local retstatus_ps
146 + local t
147 + addpredict /this-dir-does-not-exist/t9.MYI
148 +
149 + # Ensure that parallel runs don't die
150 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
151 +
152 + # archive_gis really sucks a lot, but it's only relevant for the
153 + # USE=extraengines case
154 + case ${PV} in
155 + 5.0.42)
156 + mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
157 + ;;
158 +
159 + 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
160 + [ "$(tc-endian)" == "big" ] && \
161 + mysql-v2_disable_test \
162 + "archive_gis" \
163 + "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
164 + ;;
165 + esac
166 +
167 + # This was a slight testcase breakage when the read_only security issue
168 + # was fixed.
169 + case ${PV} in
170 + 5.0.54|5.0.51*)
171 + mysql-v2_disable_test \
172 + "read_only" \
173 + "Broken in 5.0.51-54, output in wrong order"
174 + ;;
175 + esac
176 +
177 + # Ditto to read_only
178 + [ "${PV}" == "5.0.51a" ] && \
179 + mysql-v2_disable_test \
180 + "view" \
181 + "Broken in 5.0.51, output in wrong order"
182 +
183 + # x86-specific, OOM issue with some subselects on low memory servers
184 + [ "${PV}" == "5.0.54" ] && \
185 + [ "${ARCH/x86}" != "${ARCH}" ] && \
186 + mysql-v2_disable_test \
187 + "subselect" \
188 + "Testcase needs tuning on x86 for oom condition"
189 +
190 + # Broke with the YaSSL security issue that didn't affect Gentoo.
191 + [ "${PV}" == "5.0.56" ] && \
192 + for t in openssl_1 rpl_openssl rpl_ssl ssl \
193 + ssl_8k_key ssl_compress ssl_connect ; do \
194 + mysql-v2_disable_test \
195 + "$t" \
196 + "OpenSSL tests broken on 5.0.56"
197 + done
198 +
199 + # New test was broken in first time
200 + # Upstream bug 41066
201 + # http://bugs.mysql.com/bug.php?id=41066
202 + [ "${PV}" == "5.0.72" ] && \
203 + mysql-v2_disable_test \
204 + "status2" \
205 + "Broken in 5.0.72, new test is broken, upstream bug #41066"
206 +
207 + # The entire 5.0 series has pre-generated SSL certificates, they have
208 + # mostly expired now. ${S}/mysql-tests/std-data/*.pem
209 + # The certs really SHOULD be generated for the tests, so that they are
210 + # not expiring like this. We cannot do so ourselves as the tests look
211 + # closely as the cert path data, and we do not have the CA key to regen
212 + # ourselves. Alternatively, upstream should generate them with at least
213 + # 50-year validity.
214 + #
215 + # Known expiry points:
216 + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
217 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
218 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
219 + #
220 + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
221 + # expired/invalid.
222 + case ${PV} in
223 + 5.0.*|5.1.*|5.4.*|5.5.*)
224 + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
225 + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
226 + mysql-v2_disable_test \
227 + "$t" \
228 + "These OpenSSL tests break due to expired certificates"
229 + done
230 + ;;
231 + esac
232 +
233 + # These are also failing in MySQL 5.1 for now, and are believed to be
234 + # false positives:
235 + #
236 + # main.mysql_comment, main.mysql_upgrade, main.information_schema,
237 + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
238 + # fails due to USE=-latin1 / utf8 default
239 + #
240 + # main.mysql_client_test:
241 + # segfaults at random under Portage only, suspect resource limits.
242 + #
243 + # main.not_partition:
244 + # Failure reason unknown at this time, must resolve before package.mask
245 + # removal FIXME
246 + case ${PV} in
247 + 5.1.*|5.4.*|5.5.*)
248 + for t in main.mysql_client_test main.mysql_comments \
249 + main.mysql_upgrade \
250 + main.information_schema \
251 + main.not_partition funcs_1.is_columns_mysql \
252 + funcs_1.is_tables_mysql funcs_1.is_triggers; do
253 + mysql-v2_disable_test "$t" "False positives in Gentoo"
254 + done
255 + ;;
256 + esac
257 +
258 + # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
259 + # These tests are picking up a 'connect-timeout' config from somewhere,
260 + # which is not valid, and since it does not have 'loose-' in front of
261 + # it, it's causing a failure
262 + case ${PV} in
263 + 5.1.5*|5.4.*|5.5.*|6*)
264 + for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
265 + mysql-v2_disable_test "$t" \
266 + "False positives in Gentoo: connect-timeout"
267 + done
268 + ;;
269 + esac
270 +
271 + use profiling && use community \
272 + || mysql-v2_disable_test main.profiling \
273 + "Profiling test needs profiling support"
274 +
275 + if [ "${PN}" == "mariadb" ]; then
276 + for t in \
277 + parts.part_supported_sql_func_ndb \
278 + parts.partition_auto_increment_ndb ; do
279 + mysql-v2_disable_test $t "ndb not supported in mariadb"
280 + done
281 + fi
282 +
283 + # This fail with XtraDB in place of normal InnoDB
284 + # TODO: test if they are broken with the rest of the Percona patches
285 + if xtradb_patch_available && use xtradb ; then
286 + for t in main.innodb innodb.innodb_bug51378 \
287 + main.information_schema_db main.mysqlshow \
288 + main.innodb-autoinc main.innodb_bug21704 \
289 + main.innodb_bug44369 main.innodb_bug46000 \
290 + main.index_merge_innodb \
291 + innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
292 + innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
293 + innodb.innodb_bug21704 innodb.innodb_bug44369 \
294 + innodb.innodb_bug46000 innodb.innodb_bug48024 \
295 + innodb.innodb_bug49164 innodb.innodb_bug51920 \
296 + innodb.innodb_bug54044 \
297 + ; do
298 + mysql-v2_disable_test $t "tests broken in xtradb"
299 + done
300 + fi
301 +
302 + # bug 332565
303 + if ! use extraengine ; then
304 + for t in main.range ; do
305 + mysql-v2_disable_test $t "Test $t requires USE=extraengine"
306 + done
307 + fi
308 +
309 + # create directories because mysqladmin might make out of order
310 + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
311 +
312 + # We run the test protocols seperately
313 + emake test-unit
314 + retstatus_unit=$?
315 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
316 +
317 + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
318 + retstatus_ns=$?
319 + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
320 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
321 +
322 + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
323 + retstatus_ps=$?
324 + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
325 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
326 +
327 + # TODO:
328 + # When upstream enables the pr and nr testsuites, we need those as well.
329 +
330 + # Cleanup is important for these testcases.
331 + pkill -9 -f "${S}/ndb" 2>/dev/null
332 + pkill -9 -f "${S}/sql" 2>/dev/null
333 + failures=""
334 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
335 + [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
336 + [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
337 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
338 + [[ -z "$failures" ]] || die "Test failures: $failures"
339 + einfo "Tests successfully completed"
340 + else
341 + einfo "Skipping server tests due to minimal build."
342 + fi
343 +}
344
345 diff --git a/dev-db/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild
346 new file mode 100644
347 index 0000000..18ef035
348 --- /dev/null
349 +++ b/dev-db/mysql/mysql-5.5.20.ebuild
350 @@ -0,0 +1,129 @@
351 +# Copyright 1999-2012 Gentoo Foundation
352 +# Distributed under the terms of the GNU General Public License v2
353 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
354 +
355 +EAPI="4"
356 +
357 +MY_EXTRAS_VER="20111118-2347Z"
358 +MY_PV="${PV//_alpha_pre/-m}"
359 +MY_PV="${MY_PV//_/-}"
360 +
361 +# Build type
362 +BUILD="cmake"
363 +
364 +inherit toolchain-funcs mysql-v2
365 +# only to make repoman happy. it is really set in the eclass
366 +IUSE="$IUSE"
367 +
368 +# Define the mysql-extras source
369 +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
370 +
371 +# REMEMBER: also update eclass/mysql*.eclass before committing!
372 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
373 +
374 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
375 +EPATCH_EXCLUDE=''
376 +
377 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
378 +RDEPEND="${RDEPEND}"
379 +
380 +# Please do not add a naive src_unpack to this ebuild
381 +# If you want to add a single patch, copy the ebuild to an overlay
382 +# and create your own mysql-extras tarball, looking at 000_index.txt
383 +
384 +# Official test instructions:
385 +# USE='berkdb -cluster embedded extraengine perl ssl community' \
386 +# FEATURES='test userpriv -usersandbox' \
387 +# ebuild mysql-X.X.XX.ebuild \
388 +# digest clean package
389 +src_test() {
390 +
391 + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
392 + local retstatus_unit
393 + local retstatus_tests
394 +
395 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
396 + # localhost. Also causes weird failures.
397 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
398 +
399 + if ! use "minimal" ; then
400 +
401 + if [[ $UID -eq 0 ]]; then
402 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
403 + fi
404 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
405 +
406 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
407 + addpredict /this-dir-does-not-exist/t9.MYI
408 +
409 + # Run CTest (test-units)
410 + cmake-utils_src_test
411 + retstatus_unit=$?
412 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
413 +
414 + # Ensure that parallel runs don't die
415 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
416 +
417 + # create directories because mysqladmin might right out of order
418 + mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
419 +
420 + # These are failing in MySQL 5.5 for now and are believed to be
421 + # false positives:
422 + #
423 + # main.information_schema, binlog.binlog_statement_insert_delayed,
424 + # main.mysqld--help-notwin
425 + # fails due to USE=-latin1 / utf8 default
426 + #
427 + # main.mysql_client_test:
428 + # segfaults at random under Portage only, suspect resource limits.
429 + #
430 + # sys_vars.plugin_dir_basic
431 + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
432 + # instead of MYSQL_LIBDIR/plugin
433 + #
434 + # main.flush_read_lock_kill
435 + # fails because of unknown system variable 'DEBUG_SYNC'
436 + #
437 + # main.openssl_1
438 + # error message changing
439 + # -mysqltest: Could not open connection 'default': 2026 SSL connection
440 + # error: ASN: bad other signature confirmation
441 + # +mysqltest: Could not open connection 'default': 2026 SSL connection
442 + # error: error:00000001:lib(0):func(0):reason(1)
443 + #
444 +
445 + for t in main.mysql_client_test \
446 + binlog.binlog_statement_insert_delayed main.information_schema \
447 + main.mysqld--help-notwin main.flush_read_lock_kill \
448 + sys_vars.plugin_dir_basic main.openssl_1 ; do
449 + mysql-v2_disable_test "$t" "False positives in Gentoo"
450 + done
451 +
452 + # Run mysql tests
453 + pushd "${TESTDIR}"
454 +
455 + # run mysql-test tests
456 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
457 + retstatus_tests=$?
458 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
459 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
460 +
461 + popd
462 +
463 + # Cleanup is important for these testcases.
464 + pkill -9 -f "${S}/ndb" 2>/dev/null
465 + pkill -9 -f "${S}/sql" 2>/dev/null
466 +
467 + failures=""
468 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
469 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
470 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
471 +
472 + [[ -z "$failures" ]] || die "Test failures: $failures"
473 + einfo "Tests successfully completed"
474 +
475 + else
476 +
477 + einfo "Skipping server tests due to minimal build."
478 + fi
479 +}