* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/
@ 2012-02-15 1:38 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 5+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-02-15 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 1d063866f1dbc7968e85406d76e5aaae0bb53eca
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 01:35:53 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 01:35:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1d063866
Update table_cache to table_open_cache variable for mysql-5.1 my.cnf file.
Fixes bug 403425 - thanks to Alex Efros <powerman-asdf <AT> yandex.ru> for the report.
(Portage version: 2.2.0_alpha85/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mysql/ChangeLog | 6 ++++++
dev-db/mysql/Manifest | 24 ++++++++++++++++++++++--
dev-db/mysql/files/my.cnf-5.1 | 2 +-
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 1a52010..777d211 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ files/my.cnf-5.1:
+ Update table_cache to table_open_cache variable for mysql-5.1 my.cnf file.
+ Fixes bug 403425 - thanks to Alex Efros <powerman-asdf@yandex.ru> for the
+ report.
+
*mysql-5.1.61 (31 Jan 2012)
*mysql-5.5.20 (31 Jan 2012)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8281a69..fd44386 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
-AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
+AUX my.cnf-5.1 4203 RMD160 b48a4b52e072e336640b38fd39b1d70089eae39c SHA1 3f6454e55eb659725acc2ee0f45e008430a64c75 SHA256 fcdf25863381b2c276009d2e500d18238e3fb3b2b86786a35eefa642b99282a5
AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
@@ -17,5 +20,22 @@ EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2
EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8748 RMD160 299e76c4a6ddd0066591c986231656da131eb51e SHA1 c12dd278dd8d9115384d9d9f8af76bf33bc1b1e8 SHA256 edc9a4c24a4930e75b06e8fd0fe0ba9d3ca4110738d57bbcbeb9e42f2a707c36
+MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPOwv5AAoJEC8ZTXQF1qEP92kQAIRvoYPLaBfhxuXgIaY7sLX+
+icms4ZBkiAW0hFKBQfLDMMR/6lGIGayW5ycLUaz/YPste+PoN7PTa+O+1mRoFggY
+bv68HmcupLCcCH9eidM7FRa08oA7YUYkG+lOOLE8ZWmf9soEuKlVfn6A4cxkIjF6
+BmXx8qQymapbRvhwkdrjEn7qQ0X758TL1mW2wope4xa11D4dYvhICqZqu4aPdF3y
+wALnQly61t0L2vR23bQT2ASMUx4nwhikBn0Kq6FiLKEXEEqEjgE6YAID5+nqM0q/
+huJ9vM8xKbjjBrBQQJhpEKpheWIswVoVFf6ADF6sT64mxwBDehqR84MIYBCqpx4/
+keYuaN2gDGGOrtv5o/VMmBIBmS/XdIuY6jkRU4l+OE5NcRILF4zVKoBh/MfG8tKn
+MgL0LrGMDmyUDJBbv3agXokOZo79jOEdC6JPoAOHUNDNwGb7Cog6ChcHoWNYfb/h
+mKFC447FZBcGya3z084MFpXibw65Rguq15SuUOi+24B8MYGcDKBZ5K2pSHzQ2AlD
+uCy3rS94RPkxUJ+BERGY9hC38G/M0+Tlrg9XONlJ0dv0fpt5XRGQsY1JKfAbPSAf
+t3lQEiScPxqvZ4r1LrWvAPNWMRXoZ8+x5SYbdQ+f/KCNe7PKyM5Yctv0XuuR89/+
+R9OLq3mXzwc0rzpWbYA+
+=BmyP
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
index 5a7e096..5b4f10b 100644
--- a/dev-db/mysql/files/my.cnf-5.1
+++ b/dev-db/mysql/files/my.cnf-5.1
@@ -54,7 +54,7 @@ datadir = @DATADIR@
skip-external-locking
key_buffer = 16M
max_allowed_packet = 1M
-table_cache = 64
+table_open_cache = 64
sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/
@ 2012-03-23 22:02 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2012-03-23 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 8847750997d45ecf28b0c911bf242383e5e0b457
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 19:02:43 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 09:03:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=88477509
Easier federated support.
(Portage version: 2.2.0_alpha85/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
dev-db/mysql/Manifest | 22 +---------------------
dev-db/mysql/files/my.cnf-5.1 | 4 ++++
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index fd44386..3d74d57 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
-AUX my.cnf-5.1 4203 RMD160 b48a4b52e072e336640b38fd39b1d70089eae39c SHA1 3f6454e55eb659725acc2ee0f45e008430a64c75 SHA256 fcdf25863381b2c276009d2e500d18238e3fb3b2b86786a35eefa642b99282a5
+AUX my.cnf-5.1 4308 RMD160 9f833986c42b9879881f3b6f233e7ffc8f16d6ec SHA1 80b86608e508dfc348ec7976f6d42a2331c7b150 SHA256 3718047d2e07b63668fd0ea90eea8e3284b7a2621c054c6d999a9745b119ff97
AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
@@ -22,20 +19,3 @@ EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5
EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPOwv5AAoJEC8ZTXQF1qEP92kQAIRvoYPLaBfhxuXgIaY7sLX+
-icms4ZBkiAW0hFKBQfLDMMR/6lGIGayW5ycLUaz/YPste+PoN7PTa+O+1mRoFggY
-bv68HmcupLCcCH9eidM7FRa08oA7YUYkG+lOOLE8ZWmf9soEuKlVfn6A4cxkIjF6
-BmXx8qQymapbRvhwkdrjEn7qQ0X758TL1mW2wope4xa11D4dYvhICqZqu4aPdF3y
-wALnQly61t0L2vR23bQT2ASMUx4nwhikBn0Kq6FiLKEXEEqEjgE6YAID5+nqM0q/
-huJ9vM8xKbjjBrBQQJhpEKpheWIswVoVFf6ADF6sT64mxwBDehqR84MIYBCqpx4/
-keYuaN2gDGGOrtv5o/VMmBIBmS/XdIuY6jkRU4l+OE5NcRILF4zVKoBh/MfG8tKn
-MgL0LrGMDmyUDJBbv3agXokOZo79jOEdC6JPoAOHUNDNwGb7Cog6ChcHoWNYfb/h
-mKFC447FZBcGya3z084MFpXibw65Rguq15SuUOi+24B8MYGcDKBZ5K2pSHzQ2AlD
-uCy3rS94RPkxUJ+BERGY9hC38G/M0+Tlrg9XONlJ0dv0fpt5XRGQsY1JKfAbPSAf
-t3lQEiScPxqvZ4r1LrWvAPNWMRXoZ8+x5SYbdQ+f/KCNe7PKyM5Yctv0XuuR89/+
-R9OLq3mXzwc0rzpWbYA+
-=BmyP
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
index 5b4f10b..e5738e6 100644
--- a/dev-db/mysql/files/my.cnf-5.1
+++ b/dev-db/mysql/files/my.cnf-5.1
@@ -122,6 +122,10 @@ innodb_flush_log_at_trx_commit = 1
innodb_lock_wait_timeout = 50
innodb_file_per_table
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
[mysqldump]
quick
max_allowed_packet = 16M
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/
@ 2013-01-28 2:20 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2013-01-28 2:20 UTC (permalink / raw
To: gentoo-commits
commit: 4108464ede8b491c14834e534dc7f7fa5c068037
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 02:19:10 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 02:19:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4108464e
Sync with gentoo-x86 for prefix changes & headers.
Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force
---
dev-db/mysql/ChangeLog | 5 +++
dev-db/mysql/files/my.cnf-4.0 | 4 +-
dev-db/mysql/files/my.cnf-5.1 | 56 ++++++++++++++++------------------
dev-db/mysql/files/my.cnf-5.5 | 52 ++++++++++++++++----------------
dev-db/mysql/mysql-5.1.66-r1.ebuild | 2 +-
dev-db/mysql/mysql-5.1.67-r1.ebuild | 2 +-
6 files changed, 61 insertions(+), 60 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 599209e..0473c77 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.0,
+ files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild,
+ mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild:
+ Sync with gentoo-x86 for prefix changes & headers.
+
28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.19.ebuild,
-mysql-5.5.20.ebuild, -mysql-5.5.21.ebuild, -mysql-5.5.22.ebuild,
-mysql-5.5.25a.ebuild, -mysql-5.5.27.ebuild, -mysql-5.5.28.ebuild,
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
index 305f7c9..abc8690 100644
--- a/dev-db/mysql/files/my.cnf-4.0
+++ b/dev-db/mysql/files/my.cnf-4.0
@@ -1,5 +1,5 @@
# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.2 2008/11/14 02:16:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
#
# This file can be simultaneously placed in three places:
# 1. /etc/mysql/my.cnf to set global options.
@@ -100,7 +100,7 @@ set-variable = innodb_log_buffer_size=1M
set-variable = innodb_log_files_in_group=2
# see the innodb config docs, the other options are not always safe
innodb_flush_log_at_trx_commit = 1
-innodb_file_per_table
+loose-innodb_file_per_table=1
[mysqldump]
quick
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
index e5738e6..f1ee4f2 100644
--- a/dev-db/mysql/files/my.cnf-5.1
+++ b/dev-db/mysql/files/my.cnf-5.1
@@ -1,55 +1,55 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
[mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
# use [safe_mysqld] with mysql-3
[mysqld_safe]
-err-log = /var/log/mysql/mysql.err
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
[mysqld]
character-set-server = utf8
user = mysql
port = 3306
-socket = /var/run/mysqld/mysqld.sock
-pid-file = /var/run/mysqld/mysqld.pid
-log-error = /var/log/mysql/mysqld.err
-basedir = /usr
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer = 16M
@@ -60,7 +60,7 @@ net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
-language = /usr/share/mysql/english
+language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
# security:
# using "localhost" in connects uses sockets by default
@@ -71,15 +71,15 @@ log-bin
server-id = 1
# point the following paths to different dedicated disks
-tmpdir = /tmp/
-#log-update = /path-to-dedicated-directory/hostname
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
# if needed, uncomment them, start the server and issue
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
-#log = /tmp/mysqld.sql
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
#gdb
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
@@ -100,12 +100,12 @@ innodb_buffer_pool_size = 16M
# this is the default, increase it if you have lots of tables
innodb_additional_mem_pool_size = 2M
#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
# we have to take for the moment
-#innodb_data_home_dir = /var/lib/mysql/
-#innodb_log_arch_dir = /var/lib/mysql/
-#innodb_log_group_home_dir = /var/lib/mysql/
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
# you may wish to change this size to be more suitable for your system
# the max is there to avoid run-away growth on your machine
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
@@ -122,10 +122,6 @@ innodb_flush_log_at_trx_commit = 1
innodb_lock_wait_timeout = 50
innodb_file_per_table
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
[mysqldump]
quick
max_allowed_packet = 16M
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
index 90b17b2..f43d535 100644
--- a/dev-db/mysql/files/my.cnf-5.5
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -1,55 +1,55 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: $
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
[mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
# use [safe_mysqld] with mysql-3
[mysqld_safe]
-err-log = /var/log/mysql/mysql.err
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
[mysqld]
character-set-server = utf8
user = mysql
port = 3306
-socket = /var/run/mysqld/mysqld.sock
-pid-file = /var/run/mysqld/mysqld.pid
-log-error = /var/log/mysql/mysqld.err
-basedir = /usr
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer = 16M
@@ -60,7 +60,7 @@ net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
-lc_messages_dir = /usr/share/mysql
+lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
#Set this to your desired error message language
lc_messages = en_US
@@ -73,15 +73,15 @@ log-bin
server-id = 1
# point the following paths to different dedicated disks
-tmpdir = /tmp/
-#log-update = /path-to-dedicated-directory/hostname
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
# if needed, uncomment them, start the server and issue
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
-#log = /tmp/mysqld.sql
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
#gdb
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
@@ -102,12 +102,12 @@ innodb_buffer_pool_size = 16M
# this is the default, increase it if you have lots of tables
innodb_additional_mem_pool_size = 2M
#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
# we have to take for the moment
-#innodb_data_home_dir = /var/lib/mysql/
-#innodb_log_arch_dir = /var/lib/mysql/
-#innodb_log_group_home_dir = /var/lib/mysql/
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
# you may wish to change this size to be more suitable for your system
# the max is there to avoid run-away growth on your machine
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
diff --git a/dev-db/mysql/mysql-5.1.66-r1.ebuild b/dev-db/mysql/mysql-5.1.66-r1.ebuild
index fba838e..e4a31ea 100644
--- a/dev-db/mysql/mysql-5.1.66-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.66-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66.ebuild,v 1.8 2012/12/01 00:52:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
EAPI="4"
diff --git a/dev-db/mysql/mysql-5.1.67-r1.ebuild b/dev-db/mysql/mysql-5.1.67-r1.ebuild
index c1f2f15..1917077 100644
--- a/dev-db/mysql/mysql-5.1.67-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.67-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67.ebuild,v 1.8 2013/01/21 19:29:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
EAPI="4"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/
@ 2014-01-23 3:29 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2014-01-23 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 7676df919e34ab6898e0f64e462703268e2fcd7f
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Jan 23 03:26:25 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jan 23 03:26:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7676df91
[mysql] Bump to 5.7.3m13. 2 tests fail - fix outdated cnf options
rpl.rpl_perfschema_execute_status_by_worker - binlog offset possibly due to USE="-latin1"?
binlog.binlog_server_start_options - server options error??
---
dev-db/mysql/Manifest | 1 +
dev-db/mysql/files/my.cnf-5.5 | 4 +-
dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 125 ++++++++++++++++++++++++++++
3 files changed, 128 insertions(+), 2 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5154942..b744fe4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,6 +12,7 @@ DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a1
DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82
DIST mysql-5.6.15.tar.gz 32794954 SHA256 f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512 4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d WHIRLPOOL 8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0
DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
+DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
index fa7799f..0b30a16 100644
--- a/dev-db/mysql/files/my.cnf-5.5
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -145,8 +145,8 @@ write_buffer = 2M
[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
+read_buffer_size = 2M
+write_buffer_size = 2M
[mysqlhotcopy]
interactive-timeout
diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
new file mode 100644
index 0000000..2977f9b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="none"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help-notwin, funcs_1.is_columns_mysql,
+ # funcs_1.is_tables_mysql, funcs_1.is_triggers,
+ # binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
+ # perfschema.binlog_edge_stmt
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ for t in main.mysql_client_test \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help-notwin funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers \
+ binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
+ perfschema.binlog_edge_stmt; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/
@ 2016-04-27 18:56 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2016-04-27 18:56 UTC (permalink / raw
To: gentoo-commits
commit: a8f9725eab78e01ac02423767cbe45bcdf05aafe
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:54:59 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:54:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a8f9725e
dev-db/mysql: Version bump for 5.7.12
Package-Manager: portage-2.2.28
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mysql/ChangeLog | 6 ++
dev-db/mysql/Manifest | 29 +++---
dev-db/mysql/files/5.7.12-boost.cmake | 67 ++++++++++++
dev-db/mysql/mysql-5.7.12.ebuild | 187 ++++++++++++++++++++++++++++++++++
4 files changed, 275 insertions(+), 14 deletions(-)
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 399c25f..52551b5 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mysql-5.7.12 (27 Apr 2016)
+
+ 27 Apr 2016; Brian Evans <grknight@gentoo.org> +files/5.7.12-boost.cmake,
+ +mysql-5.7.12.ebuild:
+ dev-db/mysql: Version bump for 5.7.12
+
*mysql-5.5.49 (12 Apr 2016)
*mysql-5.6.30 (12 Apr 2016)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5b7ac8b..a07e6cc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,6 +9,7 @@ DIST mysql-5.5.49.tar.gz 21202609 SHA256 cd9ca49b01a76bca635f2888b9d4d30fa6583dd
DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
+DIST mysql-5.7.12.tar.gz 50571897 SHA256 32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87 SHA512 a36013f3af9a15f8e9abec7673485ca1dd5532afcc0e2570659f510da1a1763af8de478231c5723d2395f635a6956d1500652999fedf344f7d8970265860eea5 WHIRLPOOL 9d0486ae3b8ab404f5e03829d12a477f8a990a959e32286d4920fd8bdf18689e693249be3a9f0e93e61c6a6e953846e1546620ecdeb834c4e69c45bf676a2670
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -20,19 +21,19 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJXDT0TXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXIQsDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2xNIQAOREg/YzgD1AVW1pyx2oEeIN
-DBlULjMa9UfEUO18UJRniSGmwMMvS1uP0DPI6V9M+2RkjxQxiYFX/83ExvLzZ/Mw
-OUeWldkz2SOSh4cRadcYoadknxGOfhu+oqpV8B6h0S3s/TRm8+uOIuQeErWQ6Oqt
-hlSDgYZzYutVBL+H4CV4F7felgHxzP5ts2f4UXweTH4gDnDUjv7xXA/29xUlreWl
-rZViW/Rm3jozryrdUYl/NySmxwDrUAjf1z/cmZjNiSO1N5St+lCnn4wR6sGQHaX2
-lxVoPeY+s0x7CZnRzSY3XnSLfbpfanuyGMTrG2U3M5iH3PH9mNCpqWM6tXdavE+U
-CKxKtad8SoblHLLtTEhgzJvcYm09uwcZY3cjy0pwvtNn98Q94vueglDUpik8Q+Io
-waKMDdJn5Nm5oOgejWocww79WPAC/AxbeWlk8mZZCKdse35urW/8uNRou06tvAiE
-fQf5+GMrXWtWRgbSfuc5Uo7lafCKvfVfKnrWFGoZMsLh7KntaWU6rAwwqnRRyR9J
-VdWKknKMHdNgsEwQOrSzLAeSGZiC2PYE02lQ1CrXrXDPIKD/X5e70K3qU5yjaYCE
-uKAp42KkNL8yDbGPIdZ7X/Yo+niT0WctBgf5o9jJOYtNI+PP8/yUPFJ91uzmSE+T
-/z32vbLkcBtObNKmhSWc
-=SlmU
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2gVUP/3IBPwZuxtL7bx6SFzWzYePU
+B6Lfu6OmLOzRAQohiQtQuAkw98eWf1abv2t2aT4qcagakgjmJAKKH+UIcypwQh9f
+0QMasfkjeBSw0ioQT0BlnbP2Jb1P5k6he+wOkftyOTKGGA2m6sqwPM7QUyiXglG9
+lTdbatyANEwosiG6Q9i6fOcDb1JeT6y0kFvPErN50i7xxzSwd/Cj3imTw+3XqwDc
+65S/CcJYzswB+xovaLJGmELOkFre+gHCKx1dClkBhHF6SbA1kIk1yeMKRfp82czk
+173epqJt6PS+tIOajCusrQ7wFlLPswcmum7rhYRMiEeDoyHl8p8ZusLCp7WfKuHQ
+ITFFyphfcrdubloXynUXJ0dB4PWhSiWY8IQgVEc1nCRCr5ni7kqrUl0f6u0IMHEg
+VVa0MXt0bFSkEhtS2rkUEHQVIS4k6PuO53RIZzjp1+lOU+zInnV6qZ90wK4n9Y6f
+SxRgnjUeZdV8+yx9ZUpkkFYkEttnBgq7eFmiMZsvEpJtcfCRtZFT0QZl+KxvdvEl
++Ni/C3bOPzARoNNDj/S8yeEwiof/dvNk7JvJ+wIuYY7XsU1mOibbVvQvPQrO8ghD
+4U+jaf0dakZU+Qq9+fzMWiAyQ2UjdAGq8Cvo3BjDyCgXV7zefav7dELl+trZgoOE
+sgbCr8Zz+Oco2VQcMZvl
+=EyUG
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/5.7.12-boost.cmake b/dev-db/mysql/files/5.7.12-boost.cmake
new file mode 100644
index 0000000..5a341e1
--- /dev/null
+++ b/dev-db/mysql/files/5.7.12-boost.cmake
@@ -0,0 +1,67 @@
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# We want boost 1.59.0 in order to build our boost/geometry code.
+# The boost tarball is fairly big, and takes several minutes
+# to download. So we recommend downloading/unpacking it
+# only once, in a place visible from any bzr sandbox.
+# We use only header files, so there should be no binary dependencies.
+
+# Downloading the tarball takes about 5 minutes here at the office.
+# Here are some size/time data for unpacking the tarball on my desktop:
+# size tarball-name
+# 67M boost_1_55_0.tar.gz unzipping headers ~2 seconds 117M
+# unzipping everything ~3 seconds 485M
+# 8,8M boost_headers.tar.gz unzipping everything <1 second
+
+# Invoke with -DWITH_BOOST=<directory> or set WITH_BOOST in environment.
+# If WITH_BOOST is *not* set, or is set to the special value "system",
+# we assume that the correct version (see below)
+# is installed on the compile host in the standard location.
+
+UNSET(WITH_BOOST)
+UNSET(WITH_BOOST CACHE)
+
+# Update the cache, to make it visible in cmake-gui.
+SET(WITH_BOOST ${WITH_BOOST} CACHE PATH
+ "Path to boost sources: a directory, or a tarball to be unzipped.")
+
+# Search for the version file, first in LOCAL_BOOST_DIR or WITH_BOOST
+FIND_PATH(BOOST_INCLUDE_DIR
+ NAMES boost/version.hpp
+ NO_DEFAULT_PATH
+ PATHS ${LOCAL_BOOST_DIR}
+ ${LOCAL_BOOST_DIR}/${BOOST_PACKAGE_NAME}
+ ${WITH_BOOST}
+)
+# Then search in standard places (if not found above).
+FIND_PATH(BOOST_INCLUDE_DIR
+ NAMES boost/version.hpp
+)
+
+IF(NOT BOOST_INCLUDE_DIR)
+ MESSAGE(FATAL_ERROR "Could not find (the correct version of) boost.")
+ELSE()
+ MESSAGE(STATUS "Found ${BOOST_INCLUDE_DIR}/boost/version.hpp ")
+ENDIF()
+
+MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
+
+# Bug in sqrt(NaN) on 32bit platforms
+IF(SIZEOF_VOIDP EQUAL 4)
+ ADD_DEFINITIONS(-DBOOST_GEOMETRY_SQRT_CHECK_FINITENESS)
+ENDIF()
+
+SET(USING_SYSTEM_BOOST 1)
diff --git a/dev-db/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild
new file mode 100644
index 0000000..73543de
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.12.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+SUBSLOT="20"
+
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ >=dev-libs/boost-1.60:=
+ >=app-arch/lz4-0_p131:="
+RDEPEND="${RDEPEND}"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+ "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
+ "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
+ "${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
+ "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+ "${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
+)
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_prepare() {
+ mysql-multilib-r1_src_prepare
+ if use libressl ; then
+ sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+ "${S}/cmake/ssl.cmake" || die
+ fi
+ # Oracle's boost detection does not fit well with Gentoo
+ # It includes download and build on the fly and hard depending on a single version
+ # Replace it with a stripped down version
+ cp "${FILESDIR}/5.7.12-boost.cmake" "${S}/cmake/boost.cmake" || die
+}
+
+src_configure() {
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_LZ4=system
+ -DWITH_NUMA=OFF
+ )
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if use server ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+ # These are failing in MySQL 5.5/5.6 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # funcs_1.is_triggers funcs_1.is_tables_mysql,
+ # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+ # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+ # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+ # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # rpl.rpl_plugin_load
+ # fails due to included file not listed in expected result
+ # appears to be poor planning
+ #
+ # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+ for t in \
+ binlog.binlog_mysqlbinlog_filter \
+ binlog.binlog_statement_insert_delayed \
+ funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql \
+ funcs_1.is_triggers \
+ main.information_schema \
+ main.mysql_client_test \
+ main.mysqld--help-notwin \
+ perfschema.binlog_edge_mix \
+ perfschema.binlog_edge_stmt \
+ rpl.rpl_plugin_load \
+ main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ if ! use extraengine ; then
+ # bug 401673, 530766
+ for t in federated.federated_plugin ; do
+ mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
+ done
+ fi
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # Set file limits higher so tests run
+# ulimit -n 3000
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --suite-timeout=5000 --reorder
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-27 18:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-23 3:29 [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mysql/files/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2016-04-27 18:56 Brian Evans
2013-01-28 2:20 Robin H. Johnson
2012-03-23 22:02 Robin H. Johnson
2012-02-15 1:38 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox