1 |
commit: c7b022dab5c4a26904aa4226af30e944b89c7ee7 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 2 00:47:47 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Wed Jul 2 00:47:47 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c7b022da |
7 |
|
8 |
[mysql-cluster] Bump to 7.3.3 and fix eclasses for bug 516008 |
9 |
|
10 |
--- |
11 |
dev-db/mysql-cluster/Manifest | 5 +- |
12 |
dev-db/mysql-cluster/files/my.cnf-5.5 | 149 ++++++++++++++ |
13 |
dev-db/mysql-cluster/metadata.xml | 3 - |
14 |
dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild | 229 --------------------- |
15 |
...ter-7.3.0.ebuild => mysql-cluster-7.3.3.ebuild} | 4 +- |
16 |
eclass/mysql-cmake.eclass | 2 +- |
17 |
eclass/mysql-v2.eclass | 17 +- |
18 |
7 files changed, 167 insertions(+), 242 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest |
21 |
index 2dd4ef9..033febf 100644 |
22 |
--- a/dev-db/mysql-cluster/Manifest |
23 |
+++ b/dev-db/mysql-cluster/Manifest |
24 |
@@ -1,5 +1,2 @@ |
25 |
-DIST mysql-cluster-gpl-7.0.37.tar.gz 26875310 SHA256 4711275321aa4b1e5565327323320b95d89f07fd7f076d10a5a7f51653a50754 SHA512 d84cb77bce86a6438697a0d0caed517a8e1537c56d1af23575338c789dd5e9305b3684f37fd237d6a39cc64f6d1df7fe1180e3906eecff04581d3a2962d0d870 WHIRLPOOL f7a6de3046090236dc8c28d418b3bb00f32c326c388a8a3fdcf088ee3eea8fe06366a2732f210ff1904d05fd28edd825f23adf0c87e60c7be5bc16000fba110e |
26 |
DIST mysql-cluster-gpl-7.2.13.tar.gz 28571637 SHA256 3ea1061617bf2421fc7020c48e39b7539d04580171a663c778f98aa9c0176e85 SHA512 3dbc2ae8c9827b86bc88e89e07d26f1dd72cf3de88929dc9ae520f749a435b06202cdeb026689e8ced696d7440e23b86cf89e24cb0dd9084a8fb2c307ac02cee WHIRLPOOL c5f7b7b0951acc005b0f8b08ddbdb979b94fbe17353203a83b364a6d8c41de0d95caf621eb28c96627e6318240ba1ef604517993645a5878a78734d5f5ab137d |
27 |
-DIST mysql-cluster-gpl-7.3.0.tar.gz 28623955 SHA256 ef0a8474e7debd7d4e2e900e60a08651d0c47d6d395d402061e100dc0fabcc03 SHA512 8c4eeb0d4d422bcffec0ab32286967d5fac8c54b4965f688f79794acfb90b7f477d86a8e980b62d47c68a468ff254c97569db34d2306eb6403a43a0afca64eee WHIRLPOOL 605ad60b6fa1f5948613f86568a94e21031ed7f611f3a621ae67a0ab3a387e0331c48cf2490ab4308a9ebac49e3bf0e25a7b084a4366f756a28dba3d59bcfcb3 |
28 |
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 |
29 |
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf |
30 |
+DIST mysql-cluster-gpl-7.3.3.tar.gz 41812287 SHA256 50352757d52853d1d35ecce9951839fbf43df31324136b5d764689853b696e03 SHA512 20f6793c02ad5349522c3dda1a19b2239c778cdbdac3560108e00c4255bd3d7f876f4f068cf3d0e5ee24fb2c343ba28c3fbb99b0272313f56a46b203713f8cb6 WHIRLPOOL 05f8109d1f80410c3293200e8745f057f5a56e83d5a5eb3952f8079c4ea3e56690f1423b9d4ae13f521540e1904462ec27c8919c5fa66986265c08aa7d2bbdc0 |
31 |
|
32 |
diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5 b/dev-db/mysql-cluster/files/my.cnf-5.5 |
33 |
new file mode 100644 |
34 |
index 0000000..eb4f859 |
35 |
--- /dev/null |
36 |
+++ b/dev-db/mysql-cluster/files/my.cnf-5.5 |
37 |
@@ -0,0 +1,149 @@ |
38 |
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. |
39 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $ |
40 |
+ |
41 |
+# The following options will be passed to all MySQL clients |
42 |
+[client] |
43 |
+#password = your_password |
44 |
+port = 3306 |
45 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
46 |
+ |
47 |
+[mysql] |
48 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
49 |
+default-character-set=utf8 |
50 |
+ |
51 |
+[mysqladmin] |
52 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
53 |
+default-character-set=utf8 |
54 |
+ |
55 |
+[mysqlcheck] |
56 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
57 |
+default-character-set=utf8 |
58 |
+ |
59 |
+[mysqldump] |
60 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
61 |
+default-character-set=utf8 |
62 |
+ |
63 |
+[mysqlimport] |
64 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
65 |
+default-character-set=utf8 |
66 |
+ |
67 |
+[mysqlshow] |
68 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
69 |
+default-character-set=utf8 |
70 |
+ |
71 |
+[myisamchk] |
72 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
73 |
+ |
74 |
+[myisampack] |
75 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
76 |
+ |
77 |
+# use [safe_mysqld] with mysql-3 |
78 |
+[mysqld_safe] |
79 |
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err |
80 |
+ |
81 |
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations |
82 |
+[mysqld] |
83 |
+character-set-server = utf8 |
84 |
+user = mysql |
85 |
+port = 3306 |
86 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
87 |
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid |
88 |
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err |
89 |
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr |
90 |
+datadir = @DATADIR@ |
91 |
+skip-external-locking |
92 |
+key_buffer_size = 16M |
93 |
+max_allowed_packet = 1M |
94 |
+table_open_cache = 64 |
95 |
+sort_buffer_size = 512K |
96 |
+net_buffer_length = 8K |
97 |
+read_buffer_size = 256K |
98 |
+read_rnd_buffer_size = 512K |
99 |
+myisam_sort_buffer_size = 8M |
100 |
+lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql |
101 |
+#Set this to your desired error message language |
102 |
+lc_messages = en_US |
103 |
+ |
104 |
+# security: |
105 |
+# using "localhost" in connects uses sockets by default |
106 |
+# skip-networking |
107 |
+bind-address = 127.0.0.1 |
108 |
+ |
109 |
+log-bin |
110 |
+server-id = 1 |
111 |
+ |
112 |
+# point the following paths to different dedicated disks |
113 |
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
114 |
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname |
115 |
+ |
116 |
+# you need the debug USE flag enabled to use the following directives, |
117 |
+# if needed, uncomment them, start the server and issue |
118 |
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace |
119 |
+# this will show you *exactly* what's happening in your server ;) |
120 |
+ |
121 |
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql |
122 |
+#gdb |
123 |
+#debug = d:t:i:o,/tmp/mysqld.trace |
124 |
+#one-thread |
125 |
+ |
126 |
+# the following is the InnoDB configuration |
127 |
+# if you wish to disable innodb instead |
128 |
+# uncomment just the next line |
129 |
+#skip-innodb |
130 |
+# |
131 |
+# the rest of the innodb config follows: |
132 |
+# don't eat too much memory, we're trying to be safe on 64Mb boxes |
133 |
+# you might want to bump this up a bit on boxes with more RAM |
134 |
+innodb_buffer_pool_size = 16M |
135 |
+# this is the default, increase it if you have lots of tables |
136 |
+innodb_additional_mem_pool_size = 2M |
137 |
+# |
138 |
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-( |
139 |
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route |
140 |
+# we have to take for the moment |
141 |
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
142 |
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
143 |
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
144 |
+# you may wish to change this size to be more suitable for your system |
145 |
+# the max is there to avoid run-away growth on your machine |
146 |
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M |
147 |
+# we keep this at around 25% of of innodb_buffer_pool_size |
148 |
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) |
149 |
+innodb_log_file_size = 5M |
150 |
+# this is the default, increase it if you have very large transactions going on |
151 |
+innodb_log_buffer_size = 8M |
152 |
+# this is the default and won't hurt you |
153 |
+# you shouldn't need to tweak it |
154 |
+innodb_log_files_in_group=2 |
155 |
+# see the innodb config docs, the other options are not always safe |
156 |
+innodb_flush_log_at_trx_commit = 1 |
157 |
+innodb_lock_wait_timeout = 50 |
158 |
+innodb_file_per_table |
159 |
+ |
160 |
+# Uncomment this to get FEDERATED engine support |
161 |
+#plugin-load=federated=ha_federated.so |
162 |
+loose-federated |
163 |
+ |
164 |
+[mysqldump] |
165 |
+quick |
166 |
+max_allowed_packet = 16M |
167 |
+ |
168 |
+[mysql] |
169 |
+# uncomment the next directive if you are not familiar with SQL |
170 |
+#safe-updates |
171 |
+ |
172 |
+[isamchk] |
173 |
+key_buffer_size = 20M |
174 |
+sort_buffer_size = 20M |
175 |
+read_buffer = 2M |
176 |
+write_buffer = 2M |
177 |
+ |
178 |
+[myisamchk] |
179 |
+key_buffer_size = 20M |
180 |
+sort_buffer_size = 20M |
181 |
+read_buffer_size = 2M |
182 |
+write_buffer_size = 2M |
183 |
+ |
184 |
+[mysqlhotcopy] |
185 |
+interactive-timeout |
186 |
+ |
187 |
|
188 |
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml |
189 |
index 22c35e3..0fd723f 100644 |
190 |
--- a/dev-db/mysql-cluster/metadata.xml |
191 |
+++ b/dev-db/mysql-cluster/metadata.xml |
192 |
@@ -3,7 +3,6 @@ |
193 |
<pkgmetadata> |
194 |
<herd>mysql</herd> |
195 |
<use> |
196 |
- <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag> |
197 |
<flag name='cluster'>Add support for NDB clustering</flag> |
198 |
<flag name='community'>Enables the community features from upstream.</flag> |
199 |
<flag name='embedded'>Build embedded server (libmysqld)</flag> |
200 |
@@ -12,10 +11,8 @@ |
201 |
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag> |
202 |
<flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag> |
203 |
<flag name='minimal'>Install client programs only, no server</flag> |
204 |
- <flag name='pbxt'>Add experimental support for PBXT storage engine</flag> |
205 |
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag> |
206 |
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag> |
207 |
<flag name='test'>Install upstream testsuites for end use.</flag> |
208 |
- <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag> |
209 |
</use> |
210 |
</pkgmetadata> |
211 |
|
212 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild |
213 |
deleted file mode 100644 |
214 |
index b944856..0000000 |
215 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild |
216 |
+++ /dev/null |
217 |
@@ -1,229 +0,0 @@ |
218 |
-# Copyright 1999-2013 Gentoo Foundation |
219 |
-# Distributed under the terms of the GNU General Public License v2 |
220 |
-# $Header: $ |
221 |
- |
222 |
-EAPI=4 |
223 |
-MY_EXTRAS_VER="live" |
224 |
-BUILD="autotools" |
225 |
- |
226 |
-# PBXT |
227 |
-PBXT_VERSION='1.0.11-6-pre-ga' |
228 |
-# XtraDB |
229 |
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10' |
230 |
- |
231 |
-inherit toolchain-funcs mysql-v2 |
232 |
-# only to make repoman happy. it is really set in the eclass |
233 |
-IUSE="$IUSE" |
234 |
- |
235 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
236 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris" |
237 |
- |
238 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
239 |
-# This is often broken still |
240 |
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch ' |
241 |
- |
242 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
243 |
-RDEPEND="!media-sound/amarok[embedded]" |
244 |
- |
245 |
-# Please do not add a naive src_unpack to this ebuild |
246 |
-# If you want to add a single patch, copy the ebuild to an overlay |
247 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
248 |
- |
249 |
-# Official test instructions: |
250 |
-# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
251 |
-# FEATURES='test userpriv -usersandbox' \ |
252 |
-# ebuild mysql-X.X.XX.ebuild \ |
253 |
-# digest clean package |
254 |
-src_test() { |
255 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
256 |
- # localhost. Also causes weird failures. |
257 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
258 |
- |
259 |
- emake check || die "make check failed" |
260 |
- if ! use "minimal" ; then |
261 |
- if [[ $UID -eq 0 ]]; then |
262 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
263 |
- fi |
264 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
265 |
- cd "${S}" |
266 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
267 |
- local retstatus_unit |
268 |
- local retstatus_ns |
269 |
- local retstatus_ps |
270 |
- local t |
271 |
- addpredict /this-dir-does-not-exist/t9.MYI |
272 |
- |
273 |
- # Ensure that parallel runs don't die |
274 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
275 |
- |
276 |
- # archive_gis really sucks a lot, but it's only relevant for the |
277 |
- # USE=extraengines case |
278 |
- case ${PV} in |
279 |
- 5.0.42) |
280 |
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42" |
281 |
- ;; |
282 |
- |
283 |
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) |
284 |
- [ "$(tc-endian)" == "big" ] && \ |
285 |
- mysql_disable_test \ |
286 |
- "archive_gis" \ |
287 |
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" |
288 |
- ;; |
289 |
- esac |
290 |
- |
291 |
- # This was a slight testcase breakage when the read_only security issue |
292 |
- # was fixed. |
293 |
- case ${PV} in |
294 |
- 5.0.54|5.0.51*) |
295 |
- mysql_disable_test \ |
296 |
- "read_only" \ |
297 |
- "Broken in 5.0.51-54, output in wrong order" |
298 |
- ;; |
299 |
- esac |
300 |
- |
301 |
- # Ditto to read_only |
302 |
- [ "${PV}" == "5.0.51a" ] && \ |
303 |
- mysql_disable_test \ |
304 |
- "view" \ |
305 |
- "Broken in 5.0.51, output in wrong order" |
306 |
- |
307 |
- # x86-specific, OOM issue with some subselects on low memory servers |
308 |
- [ "${PV}" == "5.0.54" ] && \ |
309 |
- [ "${ARCH/x86}" != "${ARCH}" ] && \ |
310 |
- mysql_disable_test \ |
311 |
- "subselect" \ |
312 |
- "Testcase needs tuning on x86 for oom condition" |
313 |
- |
314 |
- # Broke with the YaSSL security issue that didn't affect Gentoo. |
315 |
- [ "${PV}" == "5.0.56" ] && \ |
316 |
- for t in openssl_1 rpl_openssl rpl_ssl ssl \ |
317 |
- ssl_8k_key ssl_compress ssl_connect ; do \ |
318 |
- mysql_disable_test \ |
319 |
- "$t" \ |
320 |
- "OpenSSL tests broken on 5.0.56" |
321 |
- done |
322 |
- |
323 |
- # New test was broken in first time |
324 |
- # Upstream bug 41066 |
325 |
- # http://bugs.mysql.com/bug.php?id=41066 |
326 |
- [ "${PV}" == "5.0.72" ] && \ |
327 |
- mysql_disable_test \ |
328 |
- "status2" \ |
329 |
- "Broken in 5.0.72, new test is broken, upstream bug #41066" |
330 |
- |
331 |
- # The entire 5.0 series has pre-generated SSL certificates, they have |
332 |
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem |
333 |
- # The certs really SHOULD be generated for the tests, so that they are |
334 |
- # not expiring like this. We cannot do so ourselves as the tests look |
335 |
- # closely as the cert path data, and we do not have the CA key to regen |
336 |
- # ourselves. Alternatively, upstream should generate them with at least |
337 |
- # 50-year validity. |
338 |
- # |
339 |
- # Known expiry points: |
340 |
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 |
341 |
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 |
342 |
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 |
343 |
- # |
344 |
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be |
345 |
- # expired/invalid. |
346 |
- case ${PV} in |
347 |
- 5.0.*|5.1.*|5.4.*|5.5.*) |
348 |
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
349 |
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
350 |
- mysql_disable_test \ |
351 |
- "$t" \ |
352 |
- "These OpenSSL tests break due to expired certificates" |
353 |
- done |
354 |
- ;; |
355 |
- esac |
356 |
- |
357 |
- # These are also failing in MySQL 5.1 for now, and are believed to be |
358 |
- # false positives: |
359 |
- # |
360 |
- # main.mysql_comment, main.mysql_upgrade, main.information_schema, |
361 |
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: |
362 |
- # fails due to USE=-latin1 / utf8 default |
363 |
- # |
364 |
- # main.mysql_client_test: |
365 |
- # segfaults at random under Portage only, suspect resource limits. |
366 |
- # |
367 |
- # main.not_partition: |
368 |
- # Failure reason unknown at this time, must resolve before package.mask |
369 |
- # removal FIXME |
370 |
- case ${PV} in |
371 |
- 5.1.*|5.4.*|5.5.*) |
372 |
- for t in main.mysql_client_test main.mysql_comments \ |
373 |
- main.mysql_upgrade \ |
374 |
- main.information_schema \ |
375 |
- main.not_partition funcs_1.is_columns_mysql \ |
376 |
- funcs_1.is_tables_mysql funcs_1.is_triggers; do |
377 |
- mysql_disable_test "$t" "False positives in Gentoo" |
378 |
- done |
379 |
- ;; |
380 |
- esac |
381 |
- |
382 |
- use profiling && use community \ |
383 |
- || mysql_disable_test main.profiling \ |
384 |
- "Profiling test needs profiling support" |
385 |
- |
386 |
- if [ "${PN}" == "mariadb" ]; then |
387 |
- for t in \ |
388 |
- parts.part_supported_sql_func_ndb \ |
389 |
- parts.partition_auto_increment_ndb ; do |
390 |
- mysql_disable_test $t "ndb not supported in mariadb" |
391 |
- done |
392 |
- fi |
393 |
- |
394 |
- # This fail with XtraDB in place of normal InnoDB |
395 |
- # TODO: test if they are broken with the rest of the Percona patches |
396 |
- if xtradb_patch_available && use xtradb ; then |
397 |
- for t in main.innodb innodb.innodb_bug51378 \ |
398 |
- main.information_schema_db main.mysqlshow \ |
399 |
- main.innodb-autoinc main.innodb_bug21704 \ |
400 |
- main.innodb_bug44369 main.innodb_bug46000 \ |
401 |
- main.index_merge_innodb \ |
402 |
- innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \ |
403 |
- innodb.innodb-autoinc innodb.innodb-autoinc-44030 \ |
404 |
- innodb.innodb_bug21704 innodb.innodb_bug44369 \ |
405 |
- innodb.innodb_bug46000 innodb.innodb_bug48024 \ |
406 |
- innodb.innodb_bug49164 \ |
407 |
- ; do |
408 |
- mysql_disable_test $t "tests broken in xtradb" |
409 |
- done |
410 |
- fi |
411 |
- |
412 |
- # create directories because mysqladmin might make out of order |
413 |
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |
414 |
- |
415 |
- # We run the test protocols seperately |
416 |
- emake test-unit |
417 |
- retstatus_unit=$? |
418 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
419 |
- |
420 |
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" |
421 |
- retstatus_ns=$? |
422 |
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" |
423 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
424 |
- |
425 |
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" |
426 |
- retstatus_ps=$? |
427 |
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" |
428 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
429 |
- |
430 |
- # TODO: |
431 |
- # When upstream enables the pr and nr testsuites, we need those as well. |
432 |
- |
433 |
- # Cleanup is important for these testcases. |
434 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
435 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
436 |
- failures="" |
437 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
438 |
- [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" |
439 |
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" |
440 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
441 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
442 |
- einfo "Tests successfully completed" |
443 |
- else |
444 |
- einfo "Skipping server tests due to minimal build." |
445 |
- fi |
446 |
-} |
447 |
|
448 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild |
449 |
similarity index 97% |
450 |
rename from dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild |
451 |
rename to dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild |
452 |
index afe0df0..1f3a525 100644 |
453 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild |
454 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild |
455 |
@@ -1,4 +1,4 @@ |
456 |
-# Copyright 1999-2013 Gentoo Foundation |
457 |
+# Copyright 1999-2014 Gentoo Foundation |
458 |
# Distributed under the terms of the GNU General Public License v2 |
459 |
# $Header: $ |
460 |
|
461 |
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar |
462 |
|
463 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
464 |
# This is often broken still |
465 |
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch ' |
466 |
+#EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch ' |
467 |
|
468 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
469 |
RDEPEND="!media-sound/amarok[embedded]" |
470 |
|
471 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
472 |
index 4578020..be564c5 100644 |
473 |
--- a/eclass/mysql-cmake.eclass |
474 |
+++ b/eclass/mysql-cmake.eclass |
475 |
@@ -1,6 +1,6 @@ |
476 |
# Copyright 1999-2014 Gentoo Foundation |
477 |
# Distributed under the terms of the GNU General Public License v2 |
478 |
-# $Header: $ |
479 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.20 2014/05/15 03:18:47 grknight Exp $ |
480 |
|
481 |
# @ECLASS: mysql-cmake.eclass |
482 |
# @MAINTAINER: |
483 |
|
484 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
485 |
index fa28364..6df339a 100644 |
486 |
--- a/eclass/mysql-v2.eclass |
487 |
+++ b/eclass/mysql-v2.eclass |
488 |
@@ -1,6 +1,6 @@ |
489 |
# Copyright 1999-2014 Gentoo Foundation |
490 |
# Distributed under the terms of the GNU General Public License v2 |
491 |
-# $Header: $ |
492 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $ |
493 |
|
494 |
# @ECLASS: mysql-v2.eclass |
495 |
# @MAINTAINER: |
496 |
@@ -209,8 +209,15 @@ esac |
497 |
# Common IUSE |
498 |
IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" |
499 |
|
500 |
+# This probably could be simplified, but the syntax would have to be just right |
501 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
502 |
- mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
503 |
+ mysql_version_is_at_least "5.5" ; then |
504 |
+ IUSE="bindist ${IUSE}" |
505 |
+elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
506 |
+ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
507 |
+ IUSE="bindist ${IUSE}" |
508 |
+elif [[ ${PN} == "mysql-cluster" ]] && \ |
509 |
+ mysql_check_version_range "7.2 to 7.2.99.99" ; then |
510 |
IUSE="bindist ${IUSE}" |
511 |
fi |
512 |
|
513 |
@@ -260,7 +267,11 @@ DEPEND=" |
514 |
# !dev-db/mariadb-native-client[mysqlcompat] |
515 |
|
516 |
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit |
517 |
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
518 |
+# This probably could be simplified |
519 |
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
520 |
+ mysql_version_is_at_least "5.6.12" ; then |
521 |
+ DEPEND="${DEPEND} dev-libs/libedit" |
522 |
+elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then |
523 |
DEPEND="${DEPEND} dev-libs/libedit" |
524 |
else |
525 |
if mysql_version_is_at_least "5.5" ; then |