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: Sun, 20 Nov 2011 01:05:29
Message-Id: 55b26b13507390320fef2cc00c69890a2abb7789.robbat2@gentoo
1 commit: 55b26b13507390320fef2cc00c69890a2abb7789
2 Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
3 AuthorDate: Sun Nov 20 00:27:46 2011 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 20 00:27:46 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=55b26b13
7
8 Version bump.
9
10 (Portage version: 2.2.0_alpha74/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 dev-db/mysql/ChangeLog | 5 ++
14 dev-db/mysql/Manifest | 4 +-
15 dev-db/mysql/mysql-5.5.18.ebuild | 120 ++++++++++++++++++++++++++++++++++++++
16 3 files changed, 128 insertions(+), 1 deletions(-)
17
18 diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
19 index 9053c76..d1d9240 100644
20 --- a/dev-db/mysql/ChangeLog
21 +++ b/dev-db/mysql/ChangeLog
22 @@ -2,6 +2,11 @@
23 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
24 # $Header: $
25
26 +*mysql-5.5.18 (20 Nov 2011)
27 +
28 + 20 Nov 2011; Robin H. Johnson <robbat2@g.o> +mysql-5.5.18.ebuild:
29 + Version bump.
30 +
31 *mysql-5.1.60 (19 Nov 2011)
32
33 19 Nov 2011; Robin H. Johnson <robbat2@g.o> +mysql-5.1.60.ebuild:
34
35 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
36 index 19b1f34..f7f88e1 100644
37 --- a/dev-db/mysql/Manifest
38 +++ b/dev-db/mysql/Manifest
39 @@ -13,6 +13,7 @@ DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c
40 DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
41 DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
42 DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
43 +DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
44 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
45 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
46 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
47 @@ -29,6 +30,7 @@ EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f
48 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
49 EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
50 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
51 +EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
52 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
53 -MISC ChangeLog 8201 RMD160 3978469716f52a7e9e7264364d2169c78c58342f SHA1 594d3a51d9471b786e6933e7c9fd2584788643a5 SHA256 c4cfa668cc8e570010bd7c965c722a1318a583ae02390af9c7db1fb9173de155
54 +MISC ChangeLog 8322 RMD160 946cac6c3c96d484ae7ce578cc8f7d43637267b6 SHA1 b62a0b6ca82d6237b206676b998214e366b1ad9d SHA256 b97b798bdbb527c482da48c933d6eb2a7fcdd3d380c57ec6ce64c349d9b79771
55 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
56
57 diff --git a/dev-db/mysql/mysql-5.5.18.ebuild b/dev-db/mysql/mysql-5.5.18.ebuild
58 new file mode 100644
59 index 0000000..9bb1440
60 --- /dev/null
61 +++ b/dev-db/mysql/mysql-5.5.18.ebuild
62 @@ -0,0 +1,120 @@
63 +# Copyright 1999-2011 Gentoo Foundation
64 +# Distributed under the terms of the GNU General Public License v2
65 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
66 +
67 +EAPI="4"
68 +
69 +MY_EXTRAS_VER="20110713-0702Z"
70 +MY_PV="${PV//_alpha_pre/-m}"
71 +MY_PV="${MY_PV//_/-}"
72 +
73 +# Build type
74 +BUILD="cmake"
75 +
76 +inherit toolchain-funcs mysql-v2
77 +# only to make repoman happy. it is really set in the eclass
78 +IUSE="$IUSE"
79 +
80 +# Define the mysql-extras source
81 +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
82 +
83 +# REMEMBER: also update eclass/mysql*.eclass before committing!
84 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
85 +
86 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
87 +EPATCH_EXCLUDE=''
88 +
89 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
90 +RDEPEND="${RDEPEND}"
91 +
92 +# Please do not add a naive src_unpack to this ebuild
93 +# If you want to add a single patch, copy the ebuild to an overlay
94 +# and create your own mysql-extras tarball, looking at 000_index.txt
95 +
96 +# Official test instructions:
97 +# USE='berkdb -cluster embedded extraengine perl ssl community' \
98 +# FEATURES='test userpriv -usersandbox' \
99 +# ebuild mysql-X.X.XX.ebuild \
100 +# digest clean package
101 +src_test() {
102 +
103 + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
104 + local retstatus_unit
105 + local retstatus_tests
106 +
107 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
108 + # localhost. Also causes weird failures.
109 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
110 +
111 + if ! use "minimal" ; then
112 +
113 + if [[ $UID -eq 0 ]]; then
114 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
115 + fi
116 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
117 +
118 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
119 + addpredict /this-dir-does-not-exist/t9.MYI
120 +
121 + # Run CTest (test-units)
122 + cmake-utils_src_test
123 + retstatus_unit=$?
124 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
125 +
126 + # Ensure that parallel runs don't die
127 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
128 +
129 + # create directories because mysqladmin might right out of order
130 + mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
131 +
132 + # These are failing in MySQL 5.5 for now and are believed to be
133 + # false positives:
134 + #
135 + # main.information_schema, binlog.binlog_statement_insert_delayed,
136 + # main.mysqld--help-notwin
137 + # fails due to USE=-latin1 / utf8 default
138 + #
139 + # main.mysql_client_test:
140 + # segfaults at random under Portage only, suspect resource limits.
141 + #
142 + # sys_vars.plugin_dir_basic
143 + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
144 + # instead of MYSQL_LIBDIR/plugin
145 + #
146 + # main.flush_read_lock_kill
147 + # fails because of unknown system variable 'DEBUG_SYNC'
148 + for t in main.mysql_client_test \
149 + binlog.binlog_statement_insert_delayed main.information_schema \
150 + main.mysqld--help-notwin main.flush_read_lock_kill \
151 + sys_vars.plugin_dir_basic ; do
152 + mysql-v2_disable_test "$t" "False positives in Gentoo"
153 + done
154 +
155 + # Run mysql tests
156 + pushd "${TESTDIR}"
157 +
158 + # run mysql-test tests
159 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
160 + retstatus_tests=$?
161 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
162 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
163 +
164 + popd
165 +
166 + # Cleanup is important for these testcases.
167 + pkill -9 -f "${S}/ndb" 2>/dev/null
168 + pkill -9 -f "${S}/sql" 2>/dev/null
169 +
170 + failures=""
171 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
172 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
173 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
174 +
175 + [[ -z "$failures" ]] || die "Test failures: $failures"
176 + einfo "Tests successfully completed"
177 +
178 + else
179 +
180 + einfo "Skipping server tests due to minimal build."
181 + fi
182 +}