[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 78fa066003827efbc62b9be073e4194a57ab0a63
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue May 13 19:18:54 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue May 13 19:18:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=78fa0660
[eclass] use openssl multilib
---
eclass/mysql-multilib.eclass | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a0cb75b..2bc09b1 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -201,15 +201,11 @@ REQUIRED_USE=
# These are used for both runtime and compiletime
# MULTILIB_USEDEP only set for libraries used by the client library
DEPEND=
- ssl? ( =dev-libs/openssl-1.0.0:0=[static-libs?]
- )
- kernel_linux? (
+ ssl? ( =dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+ kernel_linux? (
sys-process/procps:0=
dev-libs/libaio:0=
)
- amd64? ( abi_x86_32? (
- app-emulation/emul-linux-x86-baselibs[abi_x86_32]
- ) )
=sys-apps/sed-4
=sys-apps/texinfo-4.7-r1
=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: aa902e1b4ae3e98d6c8d87a6d8af160e4fa6fe2e
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed May 14 00:52:18 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 00:52:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=aa902e1b
fix bison3 on mysql 5.1.xx
---
0_index.txt| 5 +
20010_all_mysql51-bison3.patch | 43 ++
2 files changed, 48 insertions(+)
diff --git a/0_index.txt b/0_index.txt
index 9cb418b..b40707d 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1666,3 +1666,8 @@
@pn mariadb-galera
@@ Export missing symbol my_charset_latin1
@@ MariaDB bug MDEV-6131
+
+@patch 20010_all_mysql-bison3.patch
+@ver 5.01.73.00 to 5.01.99.99
+@pn mysql
+@@ Fix Bison 3 compatibility
diff --git a/20010_all_mysql51-bison3.patch b/20010_all_mysql51-bison3.patch
new file mode 100644
index 000..78d0faf
--- /dev/null
+++ b/20010_all_mysql51-bison3.patch
@@ -0,0 +1,43 @@
+X-Upstream-Patch-URL:
https://bazaar.launchpad.net/~percona-core/percona-server/5.1/revision/611
+=== modified file 'Percona-Server/sql/sql_yacc.yy'
+--- Percona-Server/sql/sql_yacc.yy 2013-06-03 03:53:55 +
Percona-Server/sql/sql_yacc.yy 2014-04-23 09:26:47 +
+@@ -27,8 +27,6 @@
+ ** The type will be void*, so it must be cast to (THD*) when used.
+ ** Use the YYTHD macro for this.
+ */
+-#define YYPARSE_PARAM yythd
+-#define YYLEX_PARAM yythd
+ #define YYTHD ((THD *)yythd)
+ #define YYLIP ( YYTHD-m_parser_state-m_lip)
+
+@@ -64,7 +62,7 @@
+ ulong val= *(F); \
+ if (my_yyoverflow((B), (D), val))\
+ { \
+- yyerror((char*) (A)); \
++ yyerror(yythd, (char*) (A));\
+ return 2; \
+ } \
+ else \
+@@ -159,7 +157,7 @@
+ to abort from the parser.
+ */
+
+-void MYSQLerror(const char *s)
++void MYSQLerror(void *yythd, const char *s)
+ {
+ THD *thd= current_thd;
+
+@@ -675,7 +673,9 @@
+ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
+ %}
+
+-%pure_parser/* We have threads */
++%pure-parser/* We have threads */
++%parse-param { void *yythd }
++%lex-param { void *yythd }
+ /*
+ Currently there are 169 shift/reduce conflicts.
+ We should not introduce new conflicts any more.
+
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 5cee59c415f7cb02bed0e1009f162d4cccb6bbee Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Wed May 14 00:58:08 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Wed May 14 00:58:08 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=5cee59c4 Fix index --- 0_index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0_index.txt b/0_index.txt index b40707d..48b6ab1 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1667,7 +1667,7 @@ @@ Export missing symbol my_charset_latin1 @@ MariaDB bug MDEV-6131 -@patch 20010_all_mysql-bison3.patch +@patch 20010_all_mysql51-bison3.patch @ver 5.01.73.00 to 5.01.99.99 @pn mysql @@ Fix Bison 3 compatibility
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: ebf6e663a90951a7a75da539744c92455c25fea1
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 02:30:22 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 02:31:02 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ebf6e663
[mariadb] Set extras version on 10.0.11, remove old
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.10-r1.ebuild | 110 ---
dev-db/mariadb/mariadb-10.0.11.ebuild| 2 +-
3 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a5f91d1..4b914b9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,3 +6,4 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.37.tar.gz 46078042 SHA256
a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512
aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1
WHIRLPOOL
2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
+DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
diff --git a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild
b/dev-db/mariadb/mariadb-10.0.10-r1.ebuild
deleted file mode 100644
index 33c48c8..000
--- a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER=live
-
-# Build system
-BUILD=cmake
-
-inherit toolchain-funcs mysql-v2
-# 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 ~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 )
-RDEPEND=${RDEPEND}
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- 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 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 MariaDB 10.0 for now and are believed to
be
- # false positives
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: af3b9537a2e906d2d74c74f6f6903ccf56f65ae9
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 02:09:43 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 02:31:02 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=af3b9537
[eclass] Revert bison block due to patch from Percona
---
eclass/mysql-v2.eclass | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index cd0db68..3f904ef 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -179,7 +179,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
HOMEPAGE=http://www.mysql.com/;
if [[ ${PN} == mariadb ]]; then
HOMEPAGE=http://mariadb.org/;
@@ -341,9 +341,6 @@ DEPEND=${DEPEND}
virtual/yacc
-# Only 5.5+ has been made compatible with Bison 3+
-mysql_version_is_at_least 5.5 || DEPEND=${DEPEND} !sys-devel/bison-3.0
-
DEPEND=${DEPEND} static? ( sys-libs/ncurses[static-libs] )
# compile-time-only
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 10756484ab65af0f215a58903ba9ef8208675521
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 01:53:00 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 02:30:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=10756484
[mysql] Revision bump to fix bug 510078
---
dev-db/mysql/Manifest| 5 +
dev-db/mysql/{mysql-5.1.73.ebuild = mysql-5.1.73-r1.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 405e6bb..5c4a1f0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,18 +1,15 @@
DIST mysql-4.0.27.tar.gz 11152643 SHA256
c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512
188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e
WHIRLPOOL
d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
DIST mysql-4.1.22.tar.gz 17761101 SHA256
6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512
9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390
WHIRLPOOL
b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512
2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9
WHIRLPOOL
3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.70.tar.gz 23984241 SHA256
9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512
5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3
WHIRLPOOL
58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
DIST mysql-5.6.17.tar.gz 32862539 SHA256
f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512
36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7
WHIRLPOOL
47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256
3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512
7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b
WHIRLPOOL
6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
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
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: f4b7a8e89e418911e6af95b06c1139afb10cb0b4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 13:36:25 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 13:36:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f4b7a8e8
[eclass] Rework multilib eclass to use multilib-minimal as a base
---
eclass/mysql-cmake.eclass| 2 +-
eclass/mysql-multilib.eclass | 232 +++
2 files changed, 101 insertions(+), 133 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4109732..a9c743d 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -415,7 +415,7 @@ mysql-cmake_src_install() {
esac
einfo Building default my.cnf (${mysql_mycnf_version})
insinto ${MY_SYSCONFDIR#${EPREFIX}}
- doins scripts/mysqlaccess.conf
+ doins ${S}/scripts/mysqlaccess.conf
mycnf_src=my.cnf-${mysql_mycnf_version}
sed -e s!@DATADIR@!${MY_DATADIR}!g \
${FILESDIR}/${mycnf_src} \
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 2bc09b1..b548e40 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -27,7 +27,7 @@ MYSQL_EXTRAS=
[[ ${MY_EXTRAS_VER} == live ]] MYSQL_EXTRAS=git-2
inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
- toolchain-funcs user cmake-utils multilib-build
+ toolchain-funcs user cmake-utils multilib-minimal
#
# Supported EAPI versions and export functions
@@ -157,7 +157,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
HOMEPAGE=http://www.mysql.com/;
if [[ ${PN} == mariadb ]]; then
HOMEPAGE=http://mariadb.org/;
@@ -174,7 +174,7 @@ fi
LICENSE=GPL-2
SLOT=0
-IUSE=+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+IUSE=+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
@@ -224,7 +224,7 @@ fi
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
# Bug 441700 MariaDB =5.3 include custom mytop
- DEPEND=${DEPEND}
+ DEPEND=${DEPEND}
oqgraph? ( =dev-libs/boost-1.40.0:0= )
sphinx? ( app-misc/sphinx:0= )
!minimal? ( pam? ( virtual/pam:0= ) )
@@ -273,7 +273,7 @@ if [[ ${PN} == mariadb-galera ]] ; then
# The wsrep API version must match between the ebuild and
sys-cluster/galera.
# This will be indicated by WSREP_REVISION in the ebuild and the first
number
# in the version of sys-cluster/galera
- RDEPEND=${RDEPEND}
+ RDEPEND=${RDEPEND}
=sys-cluster/galera-${WSREP_REVISION}*
fi
@@ -381,157 +381,125 @@ mysql-multilib_src_prepare() {
# @DESCRIPTION:
# Configure mysql to build the code for Gentoo respecting the use flags.
mysql-multilib_src_configure() {
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+
debug-print-function ${FUNCNAME} $@
- _mysql-multilib_src_configure() {
-
- debug-print-function ${FUNCNAME} $@
-
- CMAKE_BUILD_TYPE=RelWithDebInfo
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug
-DNDEBUG)
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug
-DNDEBUG)
- -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
- -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
- -DSYSCONFDIR=${EPREFIX}/etc/mysql
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${P}
- -DINSTALL_DOCREADMEDIR=share/doc/${P}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_ELIBDIR=$(get_libdir)/mysql
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
- -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
- -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_SQLBENCHDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=${EPREFIX
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: fd82e8e13b6de28b2388c1b8812f4b2a32950a7c
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 14:50:42 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 14:50:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fd82e8e1
[eclass] Fix static-libs on minimal
---
eclass/mysql-cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a9c743d..7bfdf53 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -129,6 +129,7 @@ configure_cmake_minimal() {
-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-DWITHOUT_PARTITION_STORAGE_ENGINE=1
-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+ $(cmake-utils_use_enable static-libs STATIC_LIBS)
)
}
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
commit: ed250aba50eb57032dda42f4774efe4d123f0bfb
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed May 14 20:02:26 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed May 14 20:02:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ed250aba
[mariadb] Create multilib enabled ebuild for testing
---
dev-db/mariadb/Manifest | 1 -
dev-db/mariadb/mariadb-10.0.11-r1.ebuild | 107 +++
eclass/mysql-multilib.eclass | 2 +
3 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4b914b9..e35cde5 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,3 @@
-DIST mariadb-10.0.10.tar.gz 51946792 SHA256
66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512
806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948
WHIRLPOOL
79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
DIST mariadb-10.0.11.tar.gz 51084235 SHA256
631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512
0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6
WHIRLPOOL
194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
diff --git a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
b/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
new file mode 100644
index 000..773acce
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+MY_EXTRAS_VER=20140514-0124Z
+
+inherit toolchain-funcs mysql-multilib
+# 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 ~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 )
+RDEPEND=${RDEPEND}
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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 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 MariaDB 10.0 for now and are believed to
be
+ # false positives:
+ #
+ # main.information_schema,
binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, funcs_1.is_triggers
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 0002fb2c57a23c8a371f10743e84bc539ed5db19
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 15 03:11:08 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 15 03:11:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0002fb2c
[eclass] Cleanup and add usex when useful
---
eclass/mysql-cmake.eclass | 27 ---
eclass/mysql-v2.eclass| 7 ---
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7bfdf53..2102845 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -8,6 +8,7 @@
# - MySQL Team mysql-b...@gentoo.org
# - Robin H. Johnson robb...@gentoo.org
# - Jorge Manuel B. S. Vicetto jmbsvice...@gentoo.org
+# - Brian Evans grkni...@gentoo.org
# @BLURB: This eclass provides the support for cmake based mysql releases
# @DESCRIPTION:
# The mysql-cmake.eclass provides the support to build the mysql
@@ -129,7 +130,6 @@ configure_cmake_minimal() {
-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-DWITHOUT_PARTITION_STORAGE_ENGINE=1
-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
- $(cmake-utils_use_enable static-libs STATIC_LIBS)
)
}
@@ -147,7 +147,6 @@ configure_cmake_standard() {
$(cmake-utils_use_with embedded EMBEDDED_SERVER)
$(cmake-utils_use_with profiling)
$(cmake-utils_use_enable systemtap DTRACE)
- $(cmake-utils_use_enable static-libs STATIC_LIBS)
)
if use static; then
@@ -190,7 +189,6 @@ configure_cmake_standard() {
if mysql_version_is_at_least 10.0.5 ; then
# CassandraSE needs Apache Thrift which is not in
portage
- # TODO: Add use and deps for Connect SE external deps
mycmakeargs+=(
-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
$(mysql-cmake_use_plugin extraengine SEQUENCE)
@@ -308,31 +306,22 @@ mysql-cmake_src_configure() {
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
-DENABLED_LOCAL_INFILE=1
+ $(cmake-utils_use_enable static-libs STATIC_LIBS)
+ -DWITH_SSL=$(usex ssl system bundled)
)
if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
fi
- if use ssl; then
- mycmakeargs+=( -DWITH_SSL=system )
- else
- mycmakeargs+=( -DWITH_SSL=bundled )
- fi
-
# Bug 412851
- # MariaDB requires this flag to compile with GPLv3 readline linked
+ # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3
readline linked
# Adds a warning about redistribution to configure
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
- mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
- fi
-
- if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
- if use jemalloc ; then
- mycmakeargs+=( -DWITH_JEMALLOC=system )
- else
- mycmakeargs+=( -DWITH_JEMALLOC=no )
- fi
+ mycmakeargs+=(
+ -DNOT_FOR_DISTRIBUTION=1
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ )
mysql_version_is_at_least 10.0.9 mycmakeargs+=(
-DWITH_PCRE=system )
fi
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3f904ef..3a9954a 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -8,6 +8,7 @@
# - MySQL Team mysql-b...@gentoo.org
# - Robin H. Johnson robb...@gentoo.org
# - Jorge Manuel B. S. Vicetto jmbsvice...@gentoo.org
+# - Brian Evans grkni...@gentoo.org
# @BLURB: This eclass provides most of the functions for mysql ebuilds
# @DESCRIPTION:
# The mysql-v2.eclass is the base eclass to build the mysql and
@@ -792,9 +793,9 @@ mysql-v2_pkg_config() {
# Now that /var/run is a tmpfs mount point, we need to ensure it exists
before using it
PID_DIR=${EROOT}/var/run/mysqld
if [[ ! -d ${PID_DIR} ]]; then
- mkdir -p ${PID_DIR}
- chown mysql:mysql ${PID_DIR}
- chmod 755 ${PID_DIR}
+ mkdir -p ${PID_DIR} || die Could not create pid directory
+ chown mysql:mysql ${PID_DIR} || die Could not set ownership
on pid directory
+ chmod 755 ${PID_DIR} || die Could not set permissions on pid
directory
fi
pushd ${TMPDIR} /dev/null
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: c7af718971fefb74b1622dedf982997622c396b3
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 15 18:07:18 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 15 18:07:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c7af7189
[eclass] Percona has renamed libmysqlclient to libperconaserverclient. Use
symlinks to compensate
---
eclass/mysql-cmake.eclass | 11 +++
1 file changed, 11 insertions(+)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 2102845..abf0da5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -458,4 +458,15 @@ mysql-cmake_src_install() {
#Remove mytop if perl is not selected
[[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ! use perl \
rm -f ${ED}/usr/bin/mytop
+
+ # Percona has decided to rename libmysqlclient to libperconaserverclient
+ # Use a symlink to preserve linkages for those who don't use
mysql_config
+ if [[ ${PN} == percona-server ]] mysql_version_is_at_least
5.5.36 ; then
+ dosym libperconaserverclient.so
/usr/$(get_libdir)/libmysqlclient.so
+ dosym libperconaserverclient.so
/usr/$(get_libdir)/libmysqlclient_r.so
+ if use static-libs ; then
+ dosym libperconaserverclient.a
/usr/$(get_libdir)/libmysqlclient.a
+ dosym libperconaserverclient.a
/usr/$(get_libdir)/libmysqlclient_r.a
+ fi
+ fi
}
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: e0c1f075fa35a2b66d2bdb37ebaa6befdb1c9b47
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri May 16 00:24:48 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Fri May 16 00:24:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e0c1f075
[eclass] Dont block emul-linux-x86-db unless abi_x86_32 is enabled
---
eclass/mysql-multilib.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 10281c4..9b660d9 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -259,7 +259,7 @@ fi
RDEPEND=${DEPEND}
!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
selinux? ( sec-policy/selinux-mysql )
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/percona-server/files/
commit: c0234f337290cc18f77137a11bc569e784e260ed Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Sat May 17 00:57:27 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Sat May 17 00:57:27 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c0234f33 Updates wrt bug 510518 --- dev-db/percona-server/files/my.cnf-5.6 | 153 - eclass/mysql-cmake.eclass | 6 +- 2 files changed, 3 insertions(+), 156 deletions(-) diff --git a/dev-db/percona-server/files/my.cnf-5.6 b/dev-db/percona-server/files/my.cnf-5.6 deleted file mode 100644 index f43d535..000 --- a/dev-db/percona-server/files/my.cnf-5.6 +++ /dev/null @@ -1,153 +0,0 @@ -# @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 = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock - -[mysql] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqladmin] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlcheck] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqldump] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlimport] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlshow] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[myisamchk] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets - -# use [safe_mysqld] with mysql-3 -[mysqld_safe] -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 = @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 -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size= 8M -lc_messages_dir= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql -#Set this to your desired error message language -lc_messages= en_US - -# security: -# using localhost in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -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 @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace -# this will show you *exactly* what's happening in your server ;) - -#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql -#gdb -#debug = d:t:i:o,/tmp/mysqld.trace -#one-thread - -# uncomment the following directives if you are using BDB tables -#bdb_cache_size= 4M -#bdb_max_lock = 1 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 623f3c3838de2dddf7c5949f4e5ec47bd5a083b5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Mon May 19 16:23:57 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon May 19 17:01:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=623f3c38
[eclass] Force tmpdir to make sure the portage directory is not used
---
eclass/mysql-multilib.eclass | 7 ---
eclass/mysql-v2.eclass | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9b660d9..1f664cb 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -750,7 +750,7 @@ mysql-multilib_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db'
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
+ cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -779,12 +779,13 @@ mysql-multilib_pkg_config() {
--user=mysql \
--log-warnings=0 \
--basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
+ --datadir=${EROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
- --pid-file=${pidfile}
+ --pid-file=${pidfile}
+ --tmpdir=${EROOT}/${MYSQL_TMPDIR}
#einfo About to start mysqld: ${mysqld}
ebegin Starting mysqld
einfo Command ${mysqld}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3a9954a..a1558de 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -802,7 +802,7 @@ mysql-v2_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db'
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${EROOT}/${MY_DATADIR}'
+ cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -831,12 +831,13 @@ mysql-v2_pkg_config() {
--user=mysql \
--log-warnings=0 \
--basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
+ --datadir=${EROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
- --pid-file=${pidfile}
+ --pid-file=${pidfile}
+ --tmpdir=${EROOT}/${MYSQL_TMPDIR}
#einfo About to start mysqld: ${mysqld}
ebegin Starting mysqld
einfo Command ${mysqld}
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: d6639476c960c995eef16ad260a362d555e49e0e
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Mar 10 20:02:15 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Mar 10 20:02:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=d6639476
Add static-libs install to patches for embedded as well
---
20006_all_cmake_elib-mariadb-5.5.33.patch | 28
20006_all_cmake_elib-mysql-5.5.35.patch | 10 --
20006_all_cmake_elib-mysql-5.6.15.patch | 10 --
20006_all_cmake_elib-percona-5.5.35.patch | 10 --
20006_all_cmake_elib-percona-5.6.15.patch | 10 --
5 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch
b/20006_all_cmake_elib-mariadb-5.5.33.patch
index 516abbd..33e902b 100644
--- a/20006_all_cmake_elib-mariadb-5.5.33.patch
+++ b/20006_all_cmake_elib-mariadb-5.5.33.patch
@@ -118,16 +118,22 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100
-@@ -134,7 +134,7 @@
+@@ -133,8 +133,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS )
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS NOINSTALL)
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
- # Visual Studio users need debug static library
- IF(MSVC)
-@@ -142,7 +142,7 @@
+ INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private
COMPONENT Development)
+
+@@ -144,7 +149,7 @@
ENDIF()
IF(UNIX)
@@ -136,7 +142,7 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
ENDIF()
-@@ -161,7 +161,7 @@
+@@ -163,7 +168,7 @@
IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API}
@@ -145,13 +151,3 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
IF(UNIX)
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500
-+++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500
-@@ -26,4 +26,6 @@
- logger_service.c)
-
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
--INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT
Development)
-+IF(ENABLE_STATIC_LIBS)
-+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT
Development)
-+ENDIF()
diff --git a/20006_all_cmake_elib-mysql-5.5.35.patch
b/20006_all_cmake_elib-mysql-5.5.35.patch
index 9d478cc..2946025 100644
--- a/20006_all_cmake_elib-mysql-5.5.35.patch
+++ b/20006_all_cmake_elib-mysql-5.5.35.patch
@@ -123,12 +123,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS )
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS NOINSTALL)
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library
IF(MSVC)
diff --git a/20006_all_cmake_elib-mysql-5.6.15.patch
b/20006_all_cmake_elib-mysql-5.6.15.patch
index 735cfa8..66b7280 100644
--- a/20006_all_cmake_elib-mysql-5.6.15.patch
+++ b/20006_all_cmake_elib-mysql-5.6.15.patch
@@ -126,12 +126,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS )
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS NOINSTALL)
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 6f5a24bc5f79392fe9c445811c2f141fb2dd95c0 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Tue Mar 11 14:55:18 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Tue Mar 11 14:55:18 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=6f5a24bc Change index for mysql-5.6.16 --- 0_index.txt | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/0_index.txt b/0_index.txt index 359a77c..caf38d0 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1606,8 +1606,14 @@ @pn percona-server @@ Remove -Werror from USE=debug builds +@patch 20007_all_cmake-debug-werror.patch +@ver 5.06.16.00 to 5.06.99.99 +@pn mysql +@pn percona-server +@@ Remove -Werror from USE=debug builds + @patch 20007_all_cmake-debug-werror-5.6.patch -@ver 5.06.00.00 to 5.06.99.99 +@ver 5.06.00.00 to 5.06.15.99 @pn mysql @pn percona-server @@ Remove -Werror from USE=debug builds
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 5f3459dfa1406108ca1a500739c7afbc899f4df4 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Tue Mar 11 15:02:45 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Tue Mar 11 15:02:45 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=5f3459df Fix cmake-debug-werror-5.6.16 patch paths --- 20007_all_cmake-debug-werror-5.6.16.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/20007_all_cmake-debug-werror-5.6.16.patch b/20007_all_cmake-debug-werror-5.6.16.patch index 3c461bd..32cadbc 100644 --- a/20007_all_cmake-debug-werror-5.6.16.patch +++ b/20007_all_cmake-debug-werror-5.6.16.patch @@ -1,5 +1,5 @@ maintainer.cmake.orig 2014-03-11 10:57:45.184755333 -0400 -+++ maintainer.cmake 2014-03-11 10:58:03.584364026 -0400 +--- a/cmake/maintainer.cmake 2014-03-11 10:57:45.184755333 -0400 b/cmake/maintainer.cmake 2014-03-11 10:58:03.584364026 -0400 @@ -18,7 +18,7 @@ # Setup GCC (GNU C compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 5f56e297a49d472f2dc5ac61e6e6836e534fed99
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Mar 11 20:06:24 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Mar 11 20:06:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5f56e297
[mysql] Version bump 5.6 series
---
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/{mysql-5.6.15.ebuild = mysql-5.6.16.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 89e8bd6..5fa8d7f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,7 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256
9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
DIST mysql-5.5.36.tar.gz 21723910 SHA256
30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512
594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684
WHIRLPOOL
6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
-DIST mysql-5.6.15.tar.gz 32794954 SHA256
f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512
4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d
WHIRLPOOL
8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0
+DIST mysql-5.6.16.tar.gz 32821451 SHA256
70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512
e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d
WHIRLPOOL
2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256
04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512
34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da
WHIRLPOOL
aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb26d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
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
diff --git a/dev-db/mysql/mysql-5.6.15.ebuild b/dev-db/mysql/mysql-5.6.16.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.6.15.ebuild
rename to dev-db/mysql/mysql-5.6.16.ebuild
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: a7ad95387c3fbe185db0850331f9b80bdd7a0093
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Mar 11 20:07:19 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Mar 11 20:07:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a7ad9538
[eclass] Update mariadb mirrors
---
eclass/mysql-multilib.eclass | 10 +-
eclass/mysql-v2.eclass | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 207ddc7..5fd8a9f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -111,11 +111,11 @@ if [[ -z ${SERVER_URI} ]]; then
MARIA_FULL_P=${PN}-${MARIA_FULL_PV}
SERVER_URI=
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-
http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
if [[ ${PN} == mariadb-galera ]]; then
MY_SOURCEDIR=${PN%%-galera}-${MARIA_FULL_PV}
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0b9d267..060c15b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -131,11 +131,11 @@ if [[ -z ${SERVER_URI} ]]; then
MARIA_FULL_P=${PN}-${MARIA_FULL_PV}
SERVER_URI=
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-
http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-
http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
if [[ ${PN} == mariadb-galera ]]; then
MY_SOURCEDIR=${PN%%-galera}-${MARIA_FULL_PV}
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 82a0db72eeae3825a0cf083ecc2ae13a4a83838e
Author: Brian Evans grknight AT lavabit DOT com
AuthorDate: Tue Mar 11 02:03:07 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Mar 11 22:44:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=82a0db72
[eclass] Remove pbxt info section from multilib
---
eclass/mysql-multilib.eclass | 15 ---
1 file changed, 15 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5fd8a9f..52ea3e2 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -610,21 +610,6 @@ mysql-multilib_pkg_postinst() {
elog mysql_upgrade tool.
einfo
fi
-
- if use_if_iuse pbxt ; then
- elog Note: PBXT is now statically built when enabled.
- elog
- elog If, you previously installed as a plugin and
- elog you cannot start the MySQL server,
- elog remove the ${MY_DATADIR}/mysql/plugin.* files, then
- elog use the MySQL upgrade script to restore the table
- elog or execute the following SQL command:
- elog CREATE TABLE IF NOT EXISTS plugin (
- elog name char(64) binary DEFAULT '' NOT NULL,
- elog dl char(128) DEFAULT '' NOT NULL,
- elog PRIMARY KEY (name)
- elog ) CHARACTER SET utf8 COLLATE utf8_bin;
- fi
}
# @FUNCTION: mysql-multilib_getopt
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/files/, eclass/
commit: ab665d8ffe03a574e3329708293bcda1cf17074c
Author: Brian Evans grknight AT lavabit DOT com
AuthorDate: Wed Mar 12 01:31:27 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Mar 12 01:31:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ab665d8f
[mariadb-galera] Provide a base config and instructions
---
dev-db/mariadb-galera/files/my.cnf-5.5 | 30 ++
eclass/mysql-v2.eclass | 10 ++
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/dev-db/mariadb-galera/files/my.cnf-5.5
b/dev-db/mariadb-galera/files/my.cnf-5.5
index 195ff90..237c97c 100644
--- a/dev-db/mariadb-galera/files/my.cnf-5.5
+++ b/dev-db/mariadb-galera/files/my.cnf-5.5
@@ -64,11 +64,6 @@ lc_messages_dir =
@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
#Set this to your desired error message language
lc_messages= en_US
-# security:
-# using localhost in connects uses sockets by default
-# skip-networking
-bind-address = 127.0.0.1
-
log-bin
server-id = 1
@@ -86,10 +81,6 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size= 4M
-#bdb_max_lock = 1
-
# the following is the InnoDB configuration
# if you wish to disable innodb instead
# uncomment just the next line
@@ -128,6 +119,22 @@ innodb_file_per_table
#plugin-load=federated=ha_federated.so
loose-federated
+# These settings are required for Galera clustering
+#mysql settings
+binlog_format=ROW
+default-storage-engine=innodb
+innodb_autoinc_lock_mode=2
+query_cache_size=0
+query_cache_type=0
+bind-address=0.0.0.0
+# Uncomment this section to activate Galera clustering
+#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
+# You should change this name to something meaningful
+#wsrep_cluster_name=my_wsrep_cluster
+# List all nodes of the cluster including this one
+#wsrep_cluster_address=gcomm://172.16.8.5,172.16.8.6,172.16.8.4
+#wsrep_sst_method=rsync
+
[mysqldump]
quick
max_allowed_packet = 16M
@@ -145,9 +152,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/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1957ec8..b541347 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -600,6 +600,16 @@ mysql-v2_pkg_postinst() {
elog If you are upgrading major versions, you should run the
elog mysql_upgrade tool.
einfo
+
+ if [[ ${PN} == mariadb-galera ]] ; then
+ einfo
+ elog Be sure to edit the my.cnf file to activate your
cluster settings.
+ elog This should be done after running \emerge
--config =${CATEGORY}/${PF}\
+ elog The first time the cluster is activated, you
should add
+ elog --wsrep-new-cluster to the options in
/etc/conf.d/mysql for one node.
+ elog This option should then be removed for subsequent
starts.
+ einfo
+ fi
fi
if use_if_iuse pbxt ; then
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 9c8d5154a08df092d22bf919a9da9c167086b454
Author: Brian Evans grknight AT lavabit DOT com
AuthorDate: Tue Mar 11 01:09:11 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Mar 11 22:44:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9c8d5154
[eclass] Dep cleanup to prevent issues with autotools builds
---
eclass/mysql-v2.eclass | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 060c15b..1957ec8 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -243,13 +243,14 @@ REQUIRED_USE=${REQUIRED_USE} minimal? ( !cluster
!extraengine !embedded ) stati
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
DEPEND=
- ssl? ( =dev-libs/openssl-0.9.6d[static-libs?] )
+ ssl? ( =dev-libs/openssl-0.9.6d )
kernel_linux? ( sys-process/procps )
=sys-apps/sed-4
=sys-apps/texinfo-4.7-r1
- =sys-libs/zlib-1.2.3[static-libs?]
- !dev-db/mariadb-native-client[mysqlcompat]
+ =sys-libs/zlib-1.2.3
+# TODO: add this as a dep if it is moved from the overlay
+# !dev-db/mariadb-native-client[mysqlcompat]
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
@@ -285,14 +286,13 @@ for i in mysql mariadb mariadb-galera
percona-server mysql-cluster ; d
DEPEND=${DEPEND} !dev-db/${i}
done
-if mysql_version_is_at_least 5.5 ; then
- DEPEND=${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] )
- DEPEND=${DEPEND} tcmalloc? ( dev-util/google-perftools )
-fi
-
if mysql_version_is_at_least 5.5.7 ; then
- DEPEND=${DEPEND} systemtap? ( =dev-util/systemtap-1.3 )
- DEPEND=${DEPEND} kernel_linux? ( dev-libs/libaio )
+ DEPEND=${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] )
+ tcmalloc? ( dev-util/google-perftools )
+ =sys-libs/zlib-1.2.3[static-libs?]
+ssl? ( =dev-libs/openssl-0.9.6d[static-libs?] )
+ systemtap? ( =dev-util/systemtap-1.3 )
+ kernel_linux? ( dev-libs/libaio )
fi
if [[ ${PN} == mysql-cluster ]] ; then
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: fa2177554b1b038c59b7e20b30b63f7fc464117e
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Mar 19 16:47:25 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Mar 19 16:47:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fa217755
[eclass] Sync with hasufell changes wrt #497532
---
eclass/mysql-cmake.eclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7fd992e..96f89b8 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -277,7 +277,10 @@ mysql-cmake_src_configure() {
CMAKE_BUILD_TYPE=RelWithDebInfo
+ # debug hack wrt #497532
mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-DSYSCONFDIR=${EPREFIX}/etc/mysql
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 316964138f9cdba7450affbead89fa91b4587302 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Mon Jul 28 22:52:04 2014 + Commit: Brian Evans grknight AT tuffmail DOT com CommitDate: Mon Jul 28 22:52:04 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=31696413 Fix runtime symbols of myodbc --- 0_index.txt | 14 +- 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch | 15 +++ 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch | 12 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/0_index.txt b/0_index.txt index 48b6ab1..4f167a1 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1661,12 +1661,24 @@ @@ Backport tzinfo symlink fix from MariaDB bug 491176 @patch 20009_all_mariadb_myodbc_symbol_fix.patch -@ver 5.05.37.00 to 10.99.99.99 +@ver 5.05.37.00 to 5.05.37.99 @pn mariadb @pn mariadb-galera @@ Export missing symbol my_charset_latin1 @@ MariaDB bug MDEV-6131 +@patch 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch +@ver 5.05.38.00 to 5.07.99.99 +@pn mysql +@pn percona-server +@@ Export missing symbols + +@patch 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch +@ver 5.05.38.00 to 10.99.99.99 +@pn mariadb +@pn mariadb-galera +@@ Export missing symbols at runtime + @patch 20010_all_mysql51-bison3.patch @ver 5.01.73.00 to 5.01.99.99 @pn mysql diff --git a/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch new file mode 100644 index 000..d43e234 --- /dev/null +++ b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch @@ -0,0 +1,15 @@ +diff -aurwN mysql.orig/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt +--- mysql.orig/libmysql/CMakeLists.txt 2014-07-27 22:21:41.711342411 -0400 mysql/libmysql/CMakeLists.txt 2014-07-27 22:26:15.558596434 -0400 +@@ -325,6 +325,11 @@ + strmake + strmake_root + strxmov ++my_thread_end_wait_time ++insert_dynamic ++delete_dynamic_element ++my_qsort ++allocate_dynamic + + # pam_mysql.so + make_scrambled_password diff --git a/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch new file mode 100644 index 000..80b24ef --- /dev/null +++ b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch @@ -0,0 +1,12 @@ +diff -auwrN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2014-07-27 22:03:27.806254846 -0400 b/libmysql/CMakeLists.txt 2014-07-27 22:05:08.400521754 -0400 +@@ -131,6 +131,8 @@ + mysql_set_character_set + mysql_get_character_set_info + mysql_stmt_next_result ++dynstr_append_os_quoted ++strfill + + CACHE INTERNAL Functions exported by client API +
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 99fe52498d9660aee37dca6c3d32de895c43a5dd Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Mon Jul 28 23:43:41 2014 + Commit: Brian Evans grknight AT tuffmail DOT com CommitDate: Mon Jul 28 23:43:41 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=99fe5249 Respin last patch for MySQL 5.6 --- 0_index.txt | 8 +++- 20009_all_mysql_myodbc_symbol_fix-5.6.patch | 12 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/0_index.txt b/0_index.txt index 4f167a1..ac7bcb0 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1668,7 +1668,13 @@ @@ MariaDB bug MDEV-6131 @patch 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch -@ver 5.05.38.00 to 5.07.99.99 +@ver 5.05.38.00 to 5.05.99.99 +@pn mysql +@pn percona-server +@@ Export missing symbols + +@patch 20009_all_mysql_myodbc_symbol_fix-5.6.patch +@ver 5.06.00.00 to 5.07.99.99 @pn mysql @pn percona-server @@ Export missing symbols diff --git a/20009_all_mysql_myodbc_symbol_fix-5.6.patch b/20009_all_mysql_myodbc_symbol_fix-5.6.patch new file mode 100644 index 000..f081d64 --- /dev/null +++ b/20009_all_mysql_myodbc_symbol_fix-5.6.patch @@ -0,0 +1,12 @@ +diff -auwrN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2014-07-27 22:03:27.806254846 -0400 b/libmysql/CMakeLists.txt 2014-07-27 22:05:08.400521754 -0400 +@@ -138,6 +138,8 @@ + mysql_load_plugin_v + mysql_options4 + mysql_plugin_options ++dynstr_append_os_quoted ++strfill + + CACHE INTERNAL Functions exported by client API +
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, dev-db/mariadb/, dev-db/percona-server/
commit: de8b3d88d4c0bc79a75d9d710697a25eb81c266f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jul 29 03:05:38 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Tue Jul 29 03:12:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b3d88
Revision bumps to fix myodbc symbols
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/{mariadb-5.5.38.ebuild = mariadb-5.5.38-r1.ebuild} | 2 +-
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/{mysql-5.5.38.ebuild = mysql-5.5.38-r1.ebuild}| 2 +-
dev-db/percona-server/Manifest | 2 +-
...a-server-5.5.38.35.2.ebuild = percona-server-5.5.38.35.2-r1.ebuild} | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index fdf9524..a1985bb 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,5 +6,5 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.38.tar.gz 45083505 SHA256
efc839e6627064b3b5c6c39854198f0d34907f48937804758d4c09c7717be8d3 SHA512
f83e501cb1c99ad17ba3e1c2fd2aa306664a16e22f71ac73013f04def6532ec1f678dade4075ab4bcbbb04ac2c4aea1cc72fd98a1fe23b17e314414ee0bc17f5
WHIRLPOOL
a07f284e0a8615426f26af3698261c1d4edd4b1fcbe5190f33a0756e5d29e9ec84d38b454ca6c3f9f4edd1e009f59e06a6d3e99a2967ccdb49cbbaa02f7bb57d
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
+DIST mysql-extras-20140729-0112Z.tar.bz2 1494826 SHA256
a6963f853ae168ba04a2fea18bda6e44d6691c4be328496ba9f6818638f7cccf SHA512
72506cb13b8b0880b9bf8846b0f6e95f22a69760d5c4d48b6d346b2ed1b2c98c718c8833222457dbf832455846d6829e4e66f582b5c29fb3f6226df62086fad6
WHIRLPOOL
40245685a26acfddb882318813c689db28f4dc67e905c3e3b06e8e37c76d2d2aaa28a57cf5f147f1744bbc780731344e0e4c4ecc3069beb210f232eaab01f714
diff --git a/dev-db/mariadb/mariadb-5.5.38.ebuild
b/dev-db/mariadb/mariadb-5.5.38-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-5.5.38.ebuild
rename to dev-db/mariadb/mariadb-5.5.38-r1.ebuild
index d027735..1d9bea7 100644
--- a/dev-db/mariadb/mariadb-5.5.38.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.38-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-MY_EXTRAS_VER=20140426-0232Z
+MY_EXTRAS_VER=20140729-0112Z
# Build system
BUILD=cmake
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index fcfce95..6c04327 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,7 +9,7 @@ DIST mysql-extras-20070105.tar.bz2 50005 SHA256
17697bf70acffd0eeefd976b5ef06dd3
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
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 9490a24afb658277ba94d95d49f3f1d16723e1e0
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jul 29 18:40:18 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Tue Jul 29 18:40:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=9490a24a
Respin ELIB patch for percona 5.6.19
---
0_index.txt | 8 +-
20006_all_cmake_elib-percona-5.6.19.patch | 206 ++
2 files changed, 213 insertions(+), 1 deletion(-)
diff --git a/0_index.txt b/0_index.txt
index ac7bcb0..e9fb4a5 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1619,7 +1619,13 @@
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-percona-5.6.16.patch
-@ver 5.06.16.00 to 5.06.99.99
+@ver 5.06.16.00 to 5.06.18.99
+@pn percona-server
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-percona-5.6.19.patch
+@ver 5.06.19.00 to 5.06.99.99
@pn percona-server
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
diff --git a/20006_all_cmake_elib-percona-5.6.19.patch
b/20006_all_cmake_elib-percona-5.6.19.patch
new file mode 100644
index 000..65c348b
--- /dev/null
+++ b/20006_all_cmake_elib-percona-5.6.19.patch
@@ -0,0 +1,206 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638
-0100
mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -43,7 +43,8 @@
+ # - INSTALL_SBINDIR (directory with mysqld)
+ # - INSTALL_SCRIPTDIR (several scripts, rarely used)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -117,6 +118,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include)
+@@ -148,9 +150,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -178,6 +182,7 @@
+ SET(INSTALL_SCRIPTDIR_DEB scripts)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include)
+@@ -204,6 +209,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include)
+@@ -234,7 +240,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -40,6 +40,8 @@
+ # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 linklibN]
+ # [EXPORTS exported_func1 exported_func_N]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
++
+ # This macro merges several static libraries into a single one or creates a
shared
+ # library from several convenience libraries
+
+@@ -214,7 +216,7 @@
+ #)
+ MACRO(MERGE_LIBRARIES)
+ MYSQL_PARSE_ARGUMENTS(ARG
+-EXPORTS;OUTPUT_NAME;COMPONENT
++EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR
+ STATIC;SHARED;MODULE;NOINSTALL
+ ${ARGN}
+ )
+@@ -265,7 +267,11 @@
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ENDIF()
+-MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++IF(ARG_OUTPUT_DIR)
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${ARG_OUTPUT_DIR
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: 193a5bf46f28b870356e2e3791b23ab7ef7df222
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul 30 19:47:48 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Wed Jul 30 19:47:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=193a5bf4
[mariadb-galera] Version bump. Test failed openssl_1 with crash. Reported as
https://mariadb.atlassian.net/browse/MDEV-6510
---
dev-db/mariadb-galera/Manifest | 4 +-
dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild | 136 -
...-5.5.37.ebuild = mariadb-galera-5.5.38.ebuild} | 0
3 files changed, 1 insertion(+), 139 deletions(-)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 6c935d1..2c7c516 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,6 +1,4 @@
DIST mariadb-galera-10.0.12.tar.gz 51307785 SHA256
e68d6ec7c99e0c361a1d2e986e4adb2436776de8192e39dc9ea08ef24e13b1ef SHA512
8c6a39d3a81a7ea795a1c55e527c85996b4dc227607722e94d3c13051e19109bb9873b9993279407064f1d9dc0d1585234af5d22d9d1940fc05b856076249504
WHIRLPOOL
2d2a2720a5b5289902254549b06dd4cbb1476ad76b6bb2bef2fbd7ae57cb8490a47a0b260507ff93ef5aa647a270d2de48f0fb7a3a9ef8dcfea059734362db7d
-DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256
ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512
78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09
WHIRLPOOL
fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
-DIST mariadb-galera-5.5.37.tar.gz 46241516 SHA256
3913849ffa754b55fedc4a9f625880dd8f25e4c5ce6e80594ac46a693494fae1 SHA512
e14dc38f2ca06d166af4a9752dac0fff2f56e674b7094704a169e7ddc1f34cff62fac3870d60743b02af45c7d8b55f7a9a981d55b8bc78269c9d88b02b4c34bc
WHIRLPOOL
39dd4e053ce815e9123aece722800a9fc0cf53ba8896eb1c702b17923499bf1fe8409ae10edfafcc813b65f6ba46e0d4dfcfa4159416ffa1d2a49c9ca4ae96e5
-DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
+DIST mariadb-galera-5.5.38.tar.gz 45256556 SHA256
85d82d1d7610eae10d49ccb8b0c64598c0da63dd5b90248b8d2c17e7cd45fb34 SHA512
40b8e7d7d5dc19e74bc7f8d1bdb3bc0cff71f5e04ca76f26b107e4267062fc906640df3463d748107df2f23f12750987116197603d32417cce9b9adc1b0310de
WHIRLPOOL
7a4f4e3f6a0dd2b29d6315a98db5884ea56531d0a4f1e1b49bc1df7868b3855a198c6473b967079b1e2e18317bc2c018c310091f9fd905cb83ada70c769bc3cc
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256
28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512
d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c
WHIRLPOOL
531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
deleted file mode 100644
index ee20d86..000
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER=20140424-1043Z
-WSREP_REVISION=23
-
-# Build system
-BUILD=cmake
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE=$IUSE
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS=~amd64 ~x86
-
-# 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='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 4214e44062954742a089b8fc470c26cc9d67e4c4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jul 31 02:33:49 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Jul 31 02:33:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4214e440
Update the multilib eclass to match the work done by grobian for mysql-v2 for
prefix.
---
eclass/mysql-multilib.eclass | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index c79571c..39eed57 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.2
2014/07/29 20:24:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.3
2014/07/31 02:31:09 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -641,7 +641,7 @@ mysql-multilib_pkg_config() {
local old_MY_DATADIR=${MY_DATADIR}
local old_HOME=${HOME}
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -692,11 +692,11 @@ mysql-multilib_pkg_config() {
MYSQL_LOG_BIN=$(mysql-multilib_getoptval mysqld log-bin)
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
- if [[ ! -d ${EROOT}/$MYSQL_TMPDIR ]]; then
+ if [[ ! -d ${ROOT}/$MYSQL_TMPDIR ]]; then
einfo Creating MySQL tmpdir $MYSQL_TMPDIR
install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_TMPDIR
fi
- if [[ ! -d ${EROOT}/$MYSQL_LOG_BIN ]]; then
+ if [[ ! -d ${ROOT}/$MYSQL_LOG_BIN ]]; then
einfo Creating MySQL log-bin directory $MYSQL_LOG_BIN
install -d -m 770 -o mysql -g mysql ${EROOT}/$MYSQL_LOG_BIN
fi
@@ -718,8 +718,8 @@ mysql-multilib_pkg_config() {
if [ -z ${MYSQL_ROOT_PASSWORD} ]; then
- einfo Please provide a password for the mysql 'root' user now,
in the
- einfo MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf
file.
+ einfo Please provide a password for the mysql 'root' user now
+ einfo or through the ${HOME}/.my.cnf file.
ewarn Avoid [\'\\_%] characters in the password
read -rsp pwd1 ; echo
@@ -733,9 +733,13 @@ mysql-multilib_pkg_config() {
unset pwd1 pwd2
fi
- local options=--log-warnings=0
+ local options
local sqltmp=$(emktemp)
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix options=${options}
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
+
local help_tables=${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql
[[ -r ${help_tables} ]] \
cp ${help_tables} ${TMPDIR}/fill_help_tables.sql \
@@ -758,10 +762,6 @@ mysql-multilib_pkg_config() {
use prefix || options=${options} --user=mysql
- # Fix bug 446200. Don't reference host my.cnf
- use prefix [[ -f ${MY_SYSCONFDIR}/my.cnf ]] \
-options=${options}
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
-
# MySQL 5.6+ needs InnoDB
if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
mysql_version_is_at_least 5.6 || options=${options}
--loose-skip-innodb
@@ -782,7 +782,7 @@ mysql-multilib_pkg_config() {
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db'
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'
+ cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'
einfo Command: $cmd
eval $cmd \
${TMPDIR}/mysql_install_db.log 21
@@ -808,16 +808,16 @@ mysql-multilib_pkg_config() {
local pidfile=${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid
local mysqld=${EROOT}/usr/sbin/mysqld \
${options} \
- --user=mysql \
+ $(use prefix || echo --user=mysql) \
--log-warnings=0 \
--basedir=${EROOT}/usr \
- --datadir=${EROOT}/${MY_DATADIR} \
+ --datadir=${ROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--default-storage-engine=MyISAM \
--socket=${socket} \
--pid-file=${pidfile
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 8a8dbdfdaac4233506946089191c2954a3275384
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jul 31 20:24:25 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Jul 31 20:24:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8a8dbdfd
Remove mysql injected features and C(XX)FLAGS
---
eclass/mysql-cmake.eclass| 2 ++
eclass/mysql-multilib.eclass | 3 +++
2 files changed, 5 insertions(+)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 8360ded..925cdc5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -317,6 +317,8 @@ mysql-cmake_src_configure() {
-DENABLED_LOCAL_INFILE=1
$(cmake-utils_use_enable static-libs STATIC_LIBS)
-DWITH_SSL=$(usex ssl system bundled)
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
)
if in_iuse bindist ; then
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 39eed57..8b4eb5a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -8,6 +8,7 @@
# - MySQL Team mysql-b...@gentoo.org
# - Robin H. Johnson robb...@gentoo.org
# - Jorge Manuel B. S. Vicetto jmbsvice...@gentoo.org
+# - Brian Evans grkni...@gentoo.org
# @BLURB: This eclass provides most of the functions for mysql ebuilds
# @DESCRIPTION:
# The mysql-multilib.eclass is the base eclass to build the mysql and
@@ -445,6 +446,8 @@ multilib_src_configure() {
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_SSL=$(usex ssl system bundled)
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
)
if in_iuse bindist ; then
[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20140801-1950Z
commit: Commit: Brian Evans grknight AT tuffmail DOT com CommitDate: Fri Aug 01 19:51:25 2014 + New tag: mysql-extras-20140801-1950Z
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 506f94556eac3a2df533f4c29f63d5b1f8437e0f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Aug 1 19:57:18 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Fri Aug 1 19:57:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=506f9455
[mysql] Version bumps. 5.6.20 needs tests run first before commit to tree
---
dev-db/mysql/Manifest| 7 +++
dev-db/mysql/{mysql-5.5.38-r1.ebuild = mysql-5.5.39.ebuild} | 4 ++--
dev-db/mysql/{mysql-5.6.19.ebuild = mysql-5.6.20.ebuild}| 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f8ccd2b..d8678fb 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,15 +2,14 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256
c79f83bed7c1ea98e018b8829375b55c1de838d
DIST mysql-4.1.22.tar.gz 17761101 SHA256
6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512
9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390
WHIRLPOOL
b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512
2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9
WHIRLPOOL
3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.38.tar.gz 21739681 SHA256
61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81 SHA512
7abaac21028d984a72b7f6a43e82fab38833094b6271fa6faadae09c6be23eba0df2151f32f8d94345d6b0bb172325995acab0185a9a85af8fd475bef4cee231
WHIRLPOOL
b1cb459790446423f510ab3ee18d39d178e438e03020faf0de1a7574d99c2648915f2c0e7503aa0288e128395880706a010fecc534a08cfd50cd49ecf7f67205
-DIST mysql-5.6.19.tar.gz 32879525 SHA256
80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f SHA512
1c60c7eaa2975d9812492a1e46f550a820c62f818a60adcbd3fc7b500799d28825e8ca17d678696ae0dcdf4df4e447fd93c64d2788dac97a6a40f3258e7d86b3
WHIRLPOOL
b2b353b65c84734c58f51063a4b4d5e6af33759f12bf169571d2ba6ed686d3fd37cc9018594839ca74f3180fc3982aebf2bbbdf599904e9a3cd9605c9d93b9f4
+DIST mysql-5.5.39.tar.gz 21713567 SHA256
1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512
1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8
WHIRLPOOL
be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
+DIST mysql-5.6.20.tar.gz 32979820 SHA256
4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d SHA512
c4bcc2a209616a38c04a4679cc7a76b354f0d7d3dda860b82b9cdb4746f897aa5c8204a440e1c65f55d81b2ac526b205dd0ba28786ba21778cc068efd71403ac
WHIRLPOOL
09cd264b098401cdde9e57fd1dcf90387cb6e5f24b874c220914c6afcc4f03bccec9cb4e83a9694e740ac0ea4e5cf37297fab60fdf4d6342df71b7e4f75590f8
DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256
3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512
7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b
WHIRLPOOL
6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
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
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: fb1789f121355b607f0674d159f21bfd073ae7d3
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Aug 2 01:11:54 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Sat Aug 2 01:11:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fb1789f1
[mysql] sync ebuild headers and keywords
---
dev-db/mysql/mysql-5.5.39.ebuild | 2 +-
dev-db/mysql/mysql-5.6.20.ebuild | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index e2b912c..3503ffe 100644
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.1
2014/08/02 00:23:41 grknight Exp $
EAPI=5
diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
index eda0822..b7dcee4 100644
--- a/dev-db/mysql/mysql-5.6.20.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.1
2014/08/02 00:23:41 grknight Exp $
EAPI=5
@@ -19,7 +19,7 @@ IUSE=$IUSE
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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~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=''
@@ -83,15 +83,15 @@ src_test() {
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource
limits.
#
- # main.mysql_tzinfo_to_sql_symlink
- # fails due to missing mysql_test/std_data/zoneinfo/GMT file
from archive
- #
+ # rpl.rpl_plugin_load
+ # fails due to included file not listed in expected result
+ # appears to be poor planning
for t in main.mysql_client_test \
binlog.binlog_statement_insert_delayed
main.information_schema \
main.mysqld--help-notwinfuncs_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 main.mysql_tzinfo_to_sql_symlink \
+ mysqld--help-notwin rpl.rpl_plugin_load \
funcs_1.is_triggers ; do
mysql-v2_disable_test $t False positives in
Gentoo
done
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: 5616c395583ce19c87641b5f03a7ef337a7d0c34
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jun 17 05:37:01 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Jun 17 05:37:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5616c395
[mariadb] Version bump on 5.5 and 10.0 series. Test pass
---
dev-db/mariadb/Manifest| 3 ++-
dev-db/mariadb/{mariadb-10.0.11.ebuild = mariadb-10.0.12.ebuild} | 2 +-
dev-db/mariadb/{mariadb-5.5.37-r1.ebuild = mariadb-5.5.38.ebuild} | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e35cde5..f35ad67 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,9 @@
DIST mariadb-10.0.11.tar.gz 51084235 SHA256
631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512
0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6
WHIRLPOOL
194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
+DIST mariadb-10.0.12.tar.gz 51100726 SHA256
612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512
09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50
WHIRLPOOL
37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
-DIST mariadb-5.5.37.tar.gz 46078042 SHA256
a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512
aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1
WHIRLPOOL
2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
+DIST mariadb-5.5.38.tar.gz 45083505 SHA256
efc839e6627064b3b5c6c39854198f0d34907f48937804758d4c09c7717be8d3 SHA512
f83e501cb1c99ad17ba3e1c2fd2aa306664a16e22f71ac73013f04def6532ec1f678dade4075ab4bcbbb04ac2c4aea1cc72fd98a1fe23b17e314414ee0bc17f5
WHIRLPOOL
a07f284e0a8615426f26af3698261c1d4edd4b1fcbe5190f33a0756e5d29e9ec84d38b454ca6c3f9f4edd1e009f59e06a6d3e99a2967ccdb49cbbaa02f7bb57d
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
diff --git a/dev-db/mariadb/mariadb-10.0.11.ebuild
b/dev-db/mariadb/mariadb-10.0.12.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.0.11.ebuild
rename to dev-db/mariadb/mariadb-10.0.12.ebuild
index bc48682..8b83df0
[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/
commit: a7a685156b4f9c0f0cf071bd084315c8a7c84c58
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jun 18 04:12:29 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jun 18 04:12:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a7a68515
[percona-server] Bump 5.5 series
---
dev-db/percona-server/Manifest | 2 +-
...cona-server-5.5.37.35.0.ebuild = percona-server-5.5.37.35.1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 027c2a7..1743490 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,4 +1,4 @@
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
DIST mysql-extras-20140509-0130Z.tar.bz2 1493031 SHA256
e7b1b0f7556c3230e7ce7c971c4562de0e5ea706301cc107b4d23136207e33fa SHA512
0f7409a48b64030c492e9600112e54a0e01b440b450b15dc2137b72971883f53bc27c3ddf591c29784c7c62673d40c37ebe6a86a21b29a64f67d82804573f009
WHIRLPOOL
6d2301aeb4a2cc53bec922f058ee58f68aaa0a4075ffdce03d5c6f249b90c7901949d3d2598c02e8287ceb6c02e3dccc673886eeaedee900882e55880e5577c3
-DIST percona-server-5.5.37-35.0.tar.gz 24261353 SHA256
8f6c61cc10b0dd4a75a19dcafcf2a945f3c4700184bbe06ac76c131c383b195c SHA512
4de50f4dae302ffa7e14916595cbe31eebd325943f3962e7e598aa73055d379cff996834ad421ec213fc4a7234275032e0726dd9f63536a243ae6f991b7e5c2f
WHIRLPOOL
05d5c551ef3876aed273847bdd50a8a8e66567551ef7e4b4699c385f5e12fef8ca41367d75bdbf78683d4de723b565eb9b80470bf93701e8fb5fa4bfa8d06c1e
+DIST percona-server-5.5.37-35.1.tar.gz 22938620 SHA256
3a08c4148a42489aab1df692f37eb1a34c2a55eb6b3fc8706f2c1c9966bf181a SHA512
b94d622a78903557c72bda6029943525516aa132758f6a97b9d4c28dd0e06fca50ae06f7bae5842185e9e2943c483ea2ef304e6570c4a4648258a66611db8cf4
WHIRLPOOL
9a2168533c2cf759c7fc96f03d36863ac59f1b4548e946f41c7e5234634ac11b16036f7a855328cf7634ad79f6d6afe239617af2a5b527060d5fa48e552b65d0
DIST percona-server-5.6.17-65.0.tar.gz 34602183 SHA256
e4246f6773330376e0548bc5d6d590e822e7be9d6fc8ceeece8f4feeafd2b9a3 SHA512
c184821c9715cb8127963e375513ec2473d2dff7f6fa7493aaacb1ea562a6cbba0e90797f1988cb44e3bca22566782efe3bd23608d416a3562a67b6fbc5e01ca
WHIRLPOOL
d4424b618ad697a98648f301df43e8ceae8b789837ae9388214b3ae4629eba2af27e307dfd8880c5c17f3a3cbf650300b397c8c354247cdee48135985a2e0f48
diff --git a/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
b/dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
similarity index 99%
rename from dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
rename to dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
index a991593..bacb017 100644
--- a/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
MY_EXTRAS_VER=20140509-0130Z
MY_PV=${PV//_alpha_pre/-m}
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 7f42ea9df4201819e43855eea10fb9ebb15c8649
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jun 18 19:46:07 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jun 18 19:46:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7f42ea9d
[eclass] Add IUSE='bindist' for bug 513710. Needs more testing
---
eclass/mysql-cmake.eclass| 11 ++-
eclass/mysql-multilib.eclass | 17 +++--
eclass/mysql-v2.eclass | 11 ++-
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index a80680a..908e66e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -301,7 +301,6 @@ mysql-cmake_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT=Gentoo Linux ${PF}
$(cmake-utils_use_with test UNIT_TESTS)
- -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -312,14 +311,16 @@ mysql-cmake_src_configure() {
if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+ else
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ $(usex bindist -DHAVE_BFD_H=0 '')
+ )
fi
- # Bug 412851
- # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3
readline linked
- # Adds a warning about redistribution to configure
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
mycmakeargs+=(
- -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
mysql_version_is_at_least 10.0.9 mycmakeargs+=(
-DWITH_PCRE=system )
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index feb9ba5..fa2ab52 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,6 +178,10 @@ SLOT=0
IUSE=+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ||
mysql_check_version_range 5.5.38 to 5.6.11.99 ; then
+ IUSE=bindist ${IUSE}
+fi
+
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
IUSE=${IUSE} oqgraph pam sphinx tokudb
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or
perfomance suffers
@@ -220,7 +224,7 @@ DEPEND=
if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
else
- DEPEND=${DEPEND} =sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}]
+ DEPEND=${DEPEND} !bindist? (
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
fi
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
@@ -417,7 +421,6 @@ multilib_src_configure() {
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-DWITH_COMMENT=Gentoo Linux ${PF}
$(cmake-utils_use_with test UNIT_TESTS)
- -DWITH_READLINE=0
-DWITH_LIBEDIT=0
-DWITH_ZLIB=system
-DWITHOUT_LIBWRAP=1
@@ -428,15 +431,17 @@ multilib_src_configure() {
if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
mycmakeargs+=( -DWITH_EDITLINE=system )
+ else
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ $(usex bindist -DHAVE_BFD_H=0)
+ )
fi
- # Bug 412851
- # MariaDB requires this flag to compile with GPLv3 readline linked
- # Adds a warning about redistribution to configure
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
mycmakeargs+=(
- -DNOT_FOR_DISTRIBUTION=1
-DWITH_JEMALLOC=$(usex jemalloc system)
)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f0c919a..9c4e8fa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -209,6 +209,11 @@ esac
# Common IUSE
IUSE=${IUSE} latin1 extraengine cluster max-idx-128 +community profiling
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] \
+ mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to
5.6.11.99 ; then
+ IUSE=bindist ${IUSE}
+fi
+
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
mysql_check_version_range 5.1.38
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: b1bd20fde61bf8404a259f45413ea4a7eccfc6a5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jun 19 01:35:28 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Jun 19 01:35:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b1bd20fd
[eclass] Fix up missing parameter in multilib
---
eclass/mysql-multilib.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index fa2ab52..53df055 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,7 +178,8 @@ SLOT=0
IUSE=+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ||
mysql_check_version_range 5.5.38 to 5.6.11.99 ; then
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] \
+ mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to
5.6.11.99 ; then
IUSE=bindist ${IUSE}
fi
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 198abde0a12843f8ab960d0035dea48601a0abb0
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Jun 19 17:33:24 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Jun 19 17:33:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=198abde0
[eclass] fix for percona-server
---
eclass/mysql-v2.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 9c4e8fa..fa28364 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -210,7 +210,7 @@ esac
IUSE=${IUSE} latin1 extraengine cluster max-idx-128 +community profiling
if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] \
- mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to
5.6.11.99 ; then
+ mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.37 to
5.6.11.99 ; then
IUSE=bindist ${IUSE}
fi
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 63a8c74fc976c60926dc28839ad76e3887fa7623
Author: Brian Evans grknight AT lavabit DOT com
AuthorDate: Wed Mar 26 23:11:47 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Mar 26 23:11:47 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=63a8c74f
[eclass] Possbile better fix for debug builds
---
eclass/mysql-cmake.eclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 96f89b8..df067a6 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -275,12 +275,10 @@ mysql-cmake_src_configure() {
debug-print-function ${FUNCNAME} $@
- CMAKE_BUILD_TYPE=RelWithDebInfo
+ CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo)
# debug hack wrt #497532
mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-DSYSCONFDIR=${EPREFIX}/etc/mysql
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 878bbcd0d4b98e7d17bbe059528e87709f50fc51
Author: Brian Evans grknight AT lavabit DOT com
AuthorDate: Wed Mar 26 23:12:13 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Mar 26 23:12:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=878bbcd0
[eclass] allow revisions of the virtual
---
eclass/mysql-v2.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b541347..cee33d4 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -351,7 +351,7 @@ fi
PDEPEND=perl? ( =dev-perl/DBD-mysql-2.9004 )
# For other stuff to bring us in
-PDEPEND=${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}
+PDEPEND=${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}
#
# External patches
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: b3b87f4899f632c548354a91bd62b9192af46f74
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Fri Mar 28 16:47:01 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Fri Mar 28 16:47:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b3b87f48
[mysql] Version bump for 5.5 series
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/{mysql-5.5.36.ebuild = mysql-5.5.37.ebuild} | 11 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5fa8d7f..204705c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,7 +4,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde1539575
DIST mysql-5.1.70.tar.gz 23984241 SHA256
9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512
5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3
WHIRLPOOL
58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-5.5.36.tar.gz 21723910 SHA256
30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512
594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684
WHIRLPOOL
6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
+DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
DIST mysql-5.6.16.tar.gz 32821451 SHA256
70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512
e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d
WHIRLPOOL
2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256
04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512
34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da
WHIRLPOOL
aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb26d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
DIST mysql-extras-20070105.tar.bz2 50005 SHA256
17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512
65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34
WHIRLPOOL
3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
diff --git a/dev-db/mysql/mysql-5.5.36.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
similarity index 91%
rename from dev-db/mysql/mysql-5.5.36.ebuild
rename to dev-db/mysql/mysql-5.5.37.ebuild
index 3f679a3..ebb6824 100644
--- a/dev-db/mysql/mysql-5.5.36.ebuild
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -67,6 +67,9 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p ${S}/mysql-test/var-tests{,/log}
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s ${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql ${S}/sql/
+
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
#
@@ -91,11 +94,14 @@ src_test() {
# +mysqltest: Could not open connection 'default': 2026 SSL
connection
# error: error:0001:lib(0):func(0):reason(1)
#
+# main.mysql_tzinfo_to_sql_symlink
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: d087ba875bc768b725f8b233e07bee0530faba4e
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu Mar 27 18:00:12 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Mar 27 18:00:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d087ba87
[mariadb-galera] Version bump 5.5 series
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb-galera/Manifest | 3 +--
...a-5.5.35.ebuild = mariadb-galera-5.5.36.ebuild} | 21 ++---
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 2d419da..3012b7e 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,3 +1,2 @@
DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256
ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512
78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09
WHIRLPOOL
fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
-DIST mariadb-galera-5.5.35.tar.gz 45869962 SHA256
be4c219df14bc8e9a98f8a1afcd165273c913e476705ac0c5170a162334adc27 SHA512
ce1cfb155b13c9def42fe6c4128fffa277591e1fb04614fe4b4f56a7d34f66aad87fe640fa27f011b396357901dfc2f3a4eb88f8f492a1c8d78a50a6dca8f66d
WHIRLPOOL
7de48f661c9e8c99d6a11029b9b9fbe79f2ee208d22f0d2d2930c1cb4b889b272d62787db0ae4252c29927c6d88fa65aa0d0daae6108a8be1dc9450182d5852c
-DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256
c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512
7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f
WHIRLPOOL
e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
+DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256
3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512
49d9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4
WHIRLPOOL
c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.35.ebuild
b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
similarity index 83%
rename from dev-db/mariadb-galera/mariadb-galera-5.5.35.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
index 77abf69..801fd97 100644
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.35.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-MY_EXTRAS_VER=20140121-1138Z
+MY_EXTRAS_VER=live
WSREP_REVISION=25
# Build system
@@ -73,26 +73,9 @@ src_test() {
# main.mysql_client_test, main.mysql_client_test_nonblock:
# 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'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL
connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL
connection
- # error: error:0001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
for t in main.mysql_client_test main.mysql_client_test_nonblock
\
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help \
funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
mysql-v2_disable_test $t False positives in
Gentoo
done
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: 21a81c273991c246374a2e1562183ab985f35d79
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Mar 31 15:27:17 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Mar 31 15:27:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=21a81c27
[mariadb] Version bump for 10.0.10 GA
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.10.ebuild | 110 ++
2 files changed, 111 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0c3263f..56b9e34 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+DIST mariadb-10.0.10.tar.gz 51946792 SHA256
66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512
806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948
WHIRLPOOL
79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
DIST mariadb-10.0.9.tar.gz 51614120 SHA256
301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512
2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064
WHIRLPOOL
0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild
b/dev-db/mariadb/mariadb-10.0.10.ebuild
new file mode 100644
index 000..d4a66b7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER=live
+
+# Build system
+BUILD=cmake
+
+inherit toolchain-funcs mysql-v2
+# 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 ~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 )
+RDEPEND=${RDEPEND}
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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 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 MariaDB 10.0 for now and are believed to
be
+ # false positives:
+ #
+ # main.information_schema,
binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, funcs_1.is_triggers,
funcs_1
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 0e9135d87a5b68b668414b4ff2af4df479f62a17
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Mar 31 17:48:41 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Mar 31 17:48:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=0e9135d8
Respin elib patches for new percona versions
---
0_index.txt | 16 ++-
20006_all_cmake_elib-percona-5.5.36.patch | 168 +
20006_all_cmake_elib-percona-5.6.16.patch | 173 ++
3 files changed, 355 insertions(+), 2 deletions(-)
diff --git a/0_index.txt b/0_index.txt
index e1c4075..94ed5c3 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1589,13 +1589,25 @@
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-percona-5.5.35.patch
-@ver 5.05.35.00 to 5.05.99.99
+@ver 5.05.35.00 to 5.05.35.99
+@pn percona-server
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-percona-5.5.36.patch
+@ver 5.05.36.00 to 5.05.99.99
@pn percona-server
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-percona-5.6.15.patch
-@ver 5.06.15.00 to 5.06.99.99
+@ver 5.06.15.00 to 5.06.15.99
+@pn percona-server
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-percona-5.6.16.patch
+@ver 5.06.16.00 to 5.06.99.99
@pn percona-server
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
diff --git a/20006_all_cmake_elib-percona-5.5.36.patch
b/20006_all_cmake_elib-percona-5.5.36.patch
new file mode 100644
index 000..1536fc2
--- /dev/null
+++ b/20006_all_cmake_elib-percona-5.5.36.patch
@@ -0,0 +1,168 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638
-0100
mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -43,7 +43,8 @@
+ # - INSTALL_SBINDIR (directory with mysqld)
+ # - INSTALL_SCRIPTDIR (several scripts, rarely used)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -117,6 +118,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include)
+@@ -148,9 +150,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -178,6 +182,7 @@
+ SET(INSTALL_SCRIPTDIR_DEB scripts)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include)
+@@ -204,6 +209,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include)
+@@ -234,7 +240,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -40,6 +40,8 @@
+ # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 linklibN]
+ # [EXPORTS exported_func1 exported_func_N]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
++
+ # This macro merges several static libraries into a single one or creates a
shared
+ # library from
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: c6fec9cf21f30d91c9b00711f501bada8f37b9f7
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Mar 31 18:05:23 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Mar 31 18:05:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=c6fec9cf
Fix bad percona patch for 5.6.16
---
20006_all_cmake_elib-percona-5.6.16.patch | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/20006_all_cmake_elib-percona-5.6.16.patch
b/20006_all_cmake_elib-percona-5.6.16.patch
index 608daad..b1a2a0b 100644
--- a/20006_all_cmake_elib-percona-5.6.16.patch
+++ b/20006_all_cmake_elib-percona-5.6.16.patch
@@ -104,19 +104,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
+
# Merge several convenience libraries into one big perconaserverclient
-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development
OUTPUT_DIR ${INSTALL_LIBDIR} $INSTALL_STATIC_LIBS})
++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development
OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library for debug projects
INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -210,10 +215,12 @@
+@@ -210,9 +215,11 @@
ENDIF()
IF(UNIX)
-- GET_TARGET_NAME(perconaserverclient lib_name)
+ GET_TARGET_NAME(perconaserverclient lib_name)
- INSTALL_SYMLINK(perconaserverclient
-${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
-${INSTALL_LIBDIR} Development)
-+ GET_TARGET_NAME(perconaserverclient lib_name)\
+ IF(ENABLE_STATIC_LIBS)
+INSTALL_SYMLINK(perconaserverclient
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/percona-server/
commit: e668d57acce32433276849590e445ce40c9d2df9 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Tue Apr 1 17:36:07 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Tue Apr 1 17:36:07 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e668d57a [percona-server] Version bumps Signed-off-by: Brian Evans grknight AT tuffmail.com --- dev-db/percona-server/Manifest| 11 ++- ...r-5.5.35.33.0.ebuild = percona-server-5.5.36.34.2.ebuild} | 10 -- ...r-5.6.15.63.0.ebuild = percona-server-5.6.16.64.2.ebuild} | 9 +++-- eclass/mysql-multilib.eclass | 9 - eclass/mysql-v2.eclass| 7 +++ 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index a49f041..f2be9e8 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,9 +1,2 @@ -DIST Percona-Server-5.5.30-rel30.2.tar.gz 22567579 SHA256 260b90a85cd6099b6ab2bbc483e9df651525dccd2f8cac1c32cf5b71c0de1ad4 SHA512 eb12ff70715e0dda4f04554f3b065c0a1fced6519d30698c3b934a7294a65f00281508f145886bb51008f29eae27db6ae0d5bb6d7beffdb107ee0494e5a15dce WHIRLPOOL 8e9534e3c0904dce7774eff3d9c6387cb22f681a23b9dabcd5fa3980b49b6b99c32fbe8f4d607595846b307491694c43f2b763c0e77c58e5b16ffef39babacc3 -DIST Percona-Server-5.5.33-rel31.1.tar.gz 22538385 SHA256 2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a SHA512 2b2aa04ce7f2ed23cd1f4752453d95a42d06e4c855330edb3606c2c03a274d96cab3c8c1b9e278b18d331090108dbfa9cc5e2789a87eee4a2935712ac612d187 WHIRLPOOL fd74b29d17b91118733c1dc1bd620694474508f850c5657bab7f064296c99246fd08ba79f6d403512652a8d2ac771a49e09a5b134ec8a564da70ce15f70b802d -DIST Percona-Server-5.5.34-rel32.0.tar.gz 22579884 SHA256 775931aba537dea4fcd4ff6d37f2f30ce24921c79cef17f0c9c595222f95a741 SHA512 46e6526444550e89831fbb96b54fb91a77a0495cb804b082ef6e4d9af5ad89b0c982356d76c7a30a6a481ff4e7c51098e953914fdee84f5577ff989f9a82bac4 WHIRLPOOL 05b639a3d9421437e99c799168ddd214ae513992b2820850a038222b7e1cd9ee30b479026aea1ea0c6c274d0d641adb5040b98d94c29c3764be5dc4ec10cd14d -DIST Percona-Server-5.5.35-rel33.0.tar.gz 22465700 SHA256 ffa9335fc6ee204b13c5d6ebe32709f2b5bc930665e8000db1864555a02049b8 SHA512 230e51c1dd9bf6e502ad392de8f976e43690449b460739d4c3d19d22a15e52243a3f09785bdab3f9406418c5acf12f6e1ddeeedc5006e0e665bfb4b6fe90bebb WHIRLPOOL cd6ccdeca0cc9f714fe5dbe49262b140213369f4faec1348f70a4ddc8d513fb92b889a7d6fa7730515bbbd0e6c87a7198943ce03a27905ae4ec7f55af1077eb4 -DIST Percona-Server-5.6.13-rc60.5.tar.gz 33213326 SHA256 90de6997d2d20e37aa7d7e240ad310a446c5c85ae55cd4146bf6b17ffd5bb0a5 SHA512 212ea07a2ebc2f743ff49768770495c954e58eaafcf8d8be9b7ba1d9ca7600865d098cb779bf3ca6f0aa49ab9f2f62b44156c7d704dca25e87be40800bd4bab4 WHIRLPOOL 85a957fef0b8f93e705d1eb4c7a545d042620032c6937f47d4468520ec5755e907a5efa58fa143e6f0f239c66a1f4ae4a80ae9133f0db05ddd9ba98a6aaa1c18 -DIST Percona-Server-5.6.13-rel61.0.tar.gz 33401056 SHA256 6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8 SHA512 7499bdc1c40fe7902412043ab7d815c97696dfaf0357681ac103f59b3a2294de4b244a9b821029b1be0ae0a1f6b27a22dd4a00c670e5b9bdb2be93250cbea846 WHIRLPOOL 9d14b2e12997797fe1f6207497b495ff82c2070d7eb146b62ac38176a3bc9302f4679afc37e4aeeae253cfb798f6ea61ea489bb10a51c11494be05674c46619f -DIST Percona-Server-5.6.14-rel62.0.tar.gz 33386914 SHA256 69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280 SHA512 d79379ec3ecb8f962bd9a7be893b3d6ac1b35f0414e919056884410c0d14ec793993a9bb8f9929b81e4db2392c2de6e5742d84207c9c2d8dcd7c184da3a8c093 WHIRLPOOL e595dfa47de77a84082acb74496a3db708f155e58452117824bf86110353f84b8ae3f5fa2a120203b30e4cb7d11f079344b3e32b83d710eec3b059575bab7fd2 -DIST Percona-Server-5.6.15-rel63.0.tar.gz 33371236 SHA256 0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc SHA512 52828d94cac2872b2a7e002d1619a5bd96dcf8bc770de13121d014e8d0f6ac81a6ce16fec3736953eefd195f802ca1933c3da0a907502954d3c05689affb WHIRLPOOL 19f580351c135270d351b9b34d5bc6a1c69f36ed5191bbe28da378c0cfe8dc93da486db5bdf3615092b0cbf284871e3c02af4cad4389b15c50365ef919cb9cf2 -DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a +DIST percona-server-5.5.36-34.2.tar.gz 24206105 SHA256 62a0c4a45412e4c2eadf53d3a60977d33e27e650be32bf46bb13dff2b3e84fee SHA512 f6a072df53c85d170774e12d39e1b8d83db8d47daae370a915d9513e7c0224cd3afa64c84242aefbea98dd2e9f363bbe6bc454a3cfc1fbecdba274f550b724ae WHIRLPOOL
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 520e5ed361dc0b2925d8a4fd30f3a8ec96360338
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 1 17:44:23 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 1 17:50:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=520e5ed3
[mysql] Version bump for 5.6 series. perfschema.aggregate test failed, retries
succeed
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/{mysql-5.6.16.ebuild = mysql-5.6.17.ebuild} | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 204705c..491f5c0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,7 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256
9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.16.tar.gz 32821451 SHA256
70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512
e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d
WHIRLPOOL
2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
+DIST mysql-5.6.17.tar.gz 32862539 SHA256
f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512
36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7
WHIRLPOOL
47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256
04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512
34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da
WHIRLPOOL
aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb26d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
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
diff --git a/dev-db/mysql/mysql-5.6.16.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
similarity index 93%
rename from dev-db/mysql/mysql-5.6.16.ebuild
rename to dev-db/mysql/mysql-5.6.17.ebuild
index 25e76e0..3de9afc 100644
--- a/dev-db/mysql/mysql-5.6.16.ebuild
+++ b/dev-db/mysql/mysql-5.6.17.ebuild
@@ -67,6 +67,9 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p ${S}/mysql-test/var-tests{,/log}
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s ${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql ${S}/sql/
+
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
#
@@ -80,18 +83,15 @@ src_test() {
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource
limits
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: ed77a974ae5947be8d33e207d0e974492e1b6e9d
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Apr 2 12:58:52 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Apr 2 12:58:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ed77a974
[mysql] Version bump for 5.7 rpl.rpl_typeconv test fails due to timeout.
resources?
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mysql/Manifest| 2 +-
...alpha_pre13.ebuild = mysql-5.7.4_alpha_pre14.ebuild} | 16
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 491f5c0..a9d6217 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,7 +6,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c30
DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
DIST mysql-5.6.17.tar.gz 32862539 SHA256
f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512
36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7
WHIRLPOOL
47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
-DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256
04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512
34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da
WHIRLPOOL
aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb26d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
+DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256
3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512
7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b
WHIRLPOOL
6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
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/mysql-5.7.3_alpha_pre13.ebuild
b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
similarity index 90%
rename from dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
rename to dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
index a650318..9026213 100644
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
+++ b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
@@ -67,6 +67,9 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p ${S}/mysql-test/var-tests{,/log}
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s ${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql ${S}/sql/
+
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
#
@@ -80,18 +83,15 @@ src_test() {
# main.mysql_client_test:
# segfaults at random under Portage
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 40da30287bc1129cac79eb959a089f15cccbbd78
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Apr 2 17:37:24 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Apr 2 17:37:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40da3028
Revert [eclass] Possbile better fix for debug builds
This reverts commit 63a8c74fc976c60926dc28839ad76e3887fa7623.
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-cmake.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index df067a6..96f89b8 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -275,10 +275,12 @@ mysql-cmake_src_configure() {
debug-print-function ${FUNCNAME} $@
- CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo)
+ CMAKE_BUILD_TYPE=RelWithDebInfo
# debug hack wrt #497532
mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-DSYSCONFDIR=${EPREFIX}/etc/mysql
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
commit: ae6c50aa500067df76eaf18bc92acab8eda6308c
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jul 1 20:47:57 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Jul 1 20:47:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ae6c50aa
[mariadb] Version bump to 10.1.0 Alpha
---
dev-db/mariadb/Manifest| 1 +
dev-db/mariadb/mariadb-10.1.0_alpha.ebuild | 109 +
eclass/mysql-cmake.eclass | 22 --
eclass/mysql-multilib.eclass | 9 ++-
4 files changed, 130 insertions(+), 11 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f35ad67..fdf9524 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
DIST mariadb-10.0.11.tar.gz 51084235 SHA256
631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512
0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6
WHIRLPOOL
194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-10.0.12.tar.gz 51100726 SHA256
612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512
09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50
WHIRLPOOL
37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
+DIST mariadb-10.1.0.tar.gz 51216842 SHA256
994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512
479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a
WHIRLPOOL
edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
diff --git a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
new file mode 100644
index 000..ad99d88
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+MY_EXTRAS_VER=20140514-0124Z
+
+inherit toolchain-funcs mysql-multilib
+# 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 ~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 )
+RDEPEND=${RDEPEND}
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ local TESTDIR=${BUILD_DIR}/mysql-test
+ local retstatus_unit
+ local retstatus_tests
+
+ multilib_is_native_abi || return
+
+ # 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
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql-cluster/files/, eclass/, dev-db/mysql-cluster/
commit: c7b022dab5c4a26904aa4226af30e944b89c7ee7 Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Wed Jul 2 00:47:47 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Wed Jul 2 00:47:47 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c7b022da [mysql-cluster] Bump to 7.3.3 and fix eclasses for bug 516008 --- dev-db/mysql-cluster/Manifest | 5 +- dev-db/mysql-cluster/files/my.cnf-5.5 | 149 ++ dev-db/mysql-cluster/metadata.xml | 3 - dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild | 229 - ...ter-7.3.0.ebuild = mysql-cluster-7.3.3.ebuild} | 4 +- eclass/mysql-cmake.eclass | 2 +- eclass/mysql-v2.eclass | 17 +- 7 files changed, 167 insertions(+), 242 deletions(-) diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest index 2dd4ef9..033febf 100644 --- a/dev-db/mysql-cluster/Manifest +++ b/dev-db/mysql-cluster/Manifest @@ -1,5 +1,2 @@ -DIST mysql-cluster-gpl-7.0.37.tar.gz 26875310 SHA256 4711275321aa4b1e5565327323320b95d89f07fd7f076d10a5a7f51653a50754 SHA512 d84cb77bce86a6438697a0d0caed517a8e1537c56d1af23575338c789dd5e9305b3684f37fd237d6a39cc64f6d1df7fe1180e3906eecff04581d3a2962d0d870 WHIRLPOOL f7a6de3046090236dc8c28d418b3bb00f32c326c388a8a3fdcf088ee3eea8fe06366a2732f210ff1904d05fd28edd825f23adf0c87e60c7be5bc16000fba110e DIST mysql-cluster-gpl-7.2.13.tar.gz 28571637 SHA256 3ea1061617bf2421fc7020c48e39b7539d04580171a663c778f98aa9c0176e85 SHA512 3dbc2ae8c9827b86bc88e89e07d26f1dd72cf3de88929dc9ae520f749a435b06202cdeb026689e8ced696d7440e23b86cf89e24cb0dd9084a8fb2c307ac02cee WHIRLPOOL c5f7b7b0951acc005b0f8b08ddbdb979b94fbe17353203a83b364a6d8c41de0d95caf621eb28c96627e6318240ba1ef604517993645a5878a78734d5f5ab137d -DIST mysql-cluster-gpl-7.3.0.tar.gz 28623955 SHA256 ef0a8474e7debd7d4e2e900e60a08651d0c47d6d395d402061e100dc0fabcc03 SHA512 8c4eeb0d4d422bcffec0ab32286967d5fac8c54b4965f688f79794acfb90b7f477d86a8e980b62d47c68a468ff254c97569db34d2306eb6403a43a0afca64eee WHIRLPOOL 605ad60b6fa1f5948613f86568a94e21031ed7f611f3a621ae67a0ab3a387e0331c48cf2490ab4308a9ebac49e3bf0e25a7b084a4366f756a28dba3d59bcfcb3 -DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 -DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf +DIST mysql-cluster-gpl-7.3.3.tar.gz 41812287 SHA256 50352757d52853d1d35ecce9951839fbf43df31324136b5d764689853b696e03 SHA512 20f6793c02ad5349522c3dda1a19b2239c778cdbdac3560108e00c4255bd3d7f876f4f068cf3d0e5ee24fb2c343ba28c3fbb99b0272313f56a46b203713f8cb6 WHIRLPOOL 05f8109d1f80410c3293200e8745f057f5a56e83d5a5eb3952f8079c4ea3e56690f1423b9d4ae13f521540e1904462ec27c8919c5fa66986265c08aa7d2bbdc0 diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5 b/dev-db/mysql-cluster/files/my.cnf-5.5 new file mode 100644 index 000..eb4f859 --- /dev/null +++ b/dev-db/mysql-cluster/files/my.cnf-5.5 @@ -0,0 +1,149 @@ +# @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 = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets + +[myisampack] +character-sets-dir
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: a2c9bd466dc0002cf2ccdf3dd291e95b7da378b6
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul 2 01:02:41 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jul 2 01:02:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a2c9bd46
[eclass] sync multilib eclass
---
eclass/mysql-multilib.eclass | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 42f965e..1c352aa 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,8 +178,14 @@ SLOT=0
IUSE=+community cluster debug embedded extraengine jemalloc latin1
max-idx-128 minimal
+perl profiling selinux ssl systemtap static static-libs tcmalloc test
-if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] \
- mysql_version_is_at_least 5.5 || mysql_check_version_range 5.5.38 to
5.6.11.99 ; then
+# This probably could be simplified, but the syntax would have to be just right
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ; then
+ IUSE=bindist ${IUSE}
+elif [[ ${PN} == mysql || ${PN} == percona-server ]] \
+ mysql_check_version_range 5.5.37 to 5.6.11.99 ; then
+ IUSE=bindist ${IUSE}
+elif [[ ${PN} == mysql-cluster ]] \
+ mysql_check_version_range 7.2 to 7.2.99.99 ; then
IUSE=bindist ${IUSE}
fi
@@ -222,8 +228,12 @@ DEPEND=
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-if [[ ${PN} == mysql || ${PN} == percona-server ]]
mysql_version_is_at_least 5.6.12 ; then
- DEPEND=${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]
+# This probably could be simplified
+if [[ ${PN} == mysql || ${PN} == percona-server ]] \
+ mysql_version_is_at_least 5.6.12 ; then
+ DEPEND=${DEPEND} dev-libs/libedit
+elif [[ ${PN} == mysql-cluster ]] mysql_version_is_at_least 7.3; then
+ DEPEND=${DEPEND} dev-libs/libedit
else
DEPEND=${DEPEND} !bindist? (
=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )
fi
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: bfc4a04a813aa9ce54025bd6eaba385ef0cb1c3e Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Wed Jul 2 02:02:05 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Wed Jul 2 02:02:05 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bfc4a04a [mariadb-galera] Version bump, 2 tests fail: perfschema.rpl_statements main.grant2 --- dev-db/mariadb-galera/Manifest | 2 +- ...mariadb-galera-10.0.7_alpha.ebuild = mariadb-galera-10.0.11.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest index 236ee5d..de501a1 100644 --- a/dev-db/mariadb-galera/Manifest +++ b/dev-db/mariadb-galera/Manifest @@ -1,5 +1,5 @@ DIST mariadb-galera-10.0.10.tar.gz 52124329 SHA256 f3120440a20d535798e08e2b4fd25f8bf05c7cc2d094c2bdf7384454354f4a96 SHA512 c99b3a9287b6b2ccacc6cfd9078bdc492f3c3e0a23963a07d2ff052ac3baf78e83283f73f771ce9d9ca32a600d440e3956005df047a332993b3c4942ce9e5e43 WHIRLPOOL e52aac77da09cde10288345b3b8fbc7e3a13fc0e26e7d63774aed04b8a79b8e9a7c0f3f2c4f1e2dfcb37984d9086a281a67ee2f8bb299d2186734700a1cad397 -DIST mariadb-galera-10.0.7.tar.gz 51553678 SHA256 93e334af054e053ba2f323a01bb8673e9661fa21e0c4a5467313f5722b274b31 SHA512 641bcf5572f425cb5a7e8a82ac25ec3e5faff726bd34d0ae913d6de8f6f2550ffbae29c927c705b32f0e46ac94587117cb28745e383be4b5dc815020fec7cfd2 WHIRLPOOL 3d96b87dbbcc8b1ef32a7581e09224f835fa9f73b73adc4639e6b01d451ae12570399456e1c4b0787b389d9db57460d931ba533a3eb0361af821c07a5b2f067a +DIST mariadb-galera-10.0.11.tar.gz 51267163 SHA256 0dcc91cb78d6bc28027469469de50fd0967123e9ec029fa37e957bb1120337fc SHA512 31627ca28bd76b448d83689f079e9249c21eca8d5ac9b8ad3326e29b9d9c44d4d74e115715d65e2eaa723c645fe9e768eebf789377e762f51286c2351884f26d WHIRLPOOL 80c2f1b730aa83754ea295004a66fabf795c293e1145581571614e1ae84103b6286c45876ce98fbb111d36ce36dc1aec6d1d5d6cba95567a1bf6bd88c346966b DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a DIST mariadb-galera-5.5.37.tar.gz 46241516 SHA256 3913849ffa754b55fedc4a9f625880dd8f25e4c5ce6e80594ac46a693494fae1 SHA512 e14dc38f2ca06d166af4a9752dac0fff2f56e674b7094704a169e7ddc1f34cff62fac3870d60743b02af45c7d8b55f7a9a981d55b8bc78269c9d88b02b4c34bc WHIRLPOOL 39dd4e053ce815e9123aece722800a9fc0cf53ba8896eb1c702b17923499bf1fe8409ae10edfafcc813b65f6ba46e0d4dfcfa4159416ffa1d2a49c9ca4ae96e5 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.11.ebuild similarity index 99% rename from dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild rename to dev-db/mariadb-galera/mariadb-galera-10.0.11.ebuild index 187b7a4..08f17c4 100644 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.11.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 MY_EXTRAS_VER=20140424-1043Z WSREP_REVISION=25
[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, eclass/
commit: 43935eb67f906ea2fd12f54b3923b04561be3604
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul 2 13:16:19 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jul 2 13:16:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=43935eb6
Experiment with placing MariaDB 10.0.X and 10.1.X into virutal 5.6. This is
the compatible versions as stated by upstream
---
eclass/mysql-multilib.eclass| 7 +++
eclass/mysql-v2.eclass | 14 +++---
virtual/mysql/mysql-10.0.ebuild | 20
virtual/mysql/mysql-5.6.ebuild | 11 +++
4 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1c352aa..870ba79 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -69,6 +69,13 @@ if [[ ${PN} == mysql-cluster ]]; then
esac
fi
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
+ case ${PV} in
+ 10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
+ esac
+fi
+
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6df339a..bbbc150 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -83,10 +83,18 @@ fi
MYSQL_PV_MAJOR=$(get_version_component_range 1-2 ${PV})
# Cluster is a special case...
-if [[ ${PN} == mysql-cluster ]]; then
- case $PV in
+if [[ ${PN} == mysql-cluster ]]; then
+ case ${PV} in
6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
- 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+ 7.2*) MYSQL_PV_MAJOR=5.5 ;;
+ 7.3*) MYSQL_PV_MAJOR=5.6 ;;
+ esac
+fi
+
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
+ case ${PV} in
+ 10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
esac
fi
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
deleted file mode 100644
index 8e28056..000
--- a/virtual/mysql/mysql-10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2
2010/03/23 14:48:06 darkside Exp $
-
-EAPI=2
-
-DESCRIPTION=Virtual for MySQL client or database
-HOMEPAGE=
-SRC_URI=
-
-LICENSE=
-SLOT=0
-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
-IUSE=embedded minimal static static-libs
-
-DEPEND=
-# TODO: add Drizzle here
-RDEPEND=|| (
- =dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-)
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 36f49c1..d69911b 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2
2010/03/23 14:48:06 darkside Exp $
+# $Header: $
-EAPI=2
+EAPI=5
DESCRIPTION=Virtual for MySQL client or database
HOMEPAGE=
@@ -14,8 +14,11 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86
IUSE=embedded minimal static static-libs
DEPEND=
-# TODO: add Drizzle and MariaDB here
RDEPEND=|| (
+ =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=]
)
[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/
commit: 6f4e8de5851cd044ad6225fdd8f7b9c2d01b2627 Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Tue Jul 8 12:45:36 2014 + Commit: Brian Evans grknight AT tuffmail DOT com CommitDate: Tue Jul 8 12:45:36 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6f4e8de5 [percona] Version bump --- dev-db/percona-server/Manifest | 2 +- ...cona-server-5.6.17.65.0.ebuild = percona-server-5.6.19.67.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index 1743490..e10cdee 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,4 +1,4 @@ DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e DIST mysql-extras-20140509-0130Z.tar.bz2 1493031 SHA256 e7b1b0f7556c3230e7ce7c971c4562de0e5ea706301cc107b4d23136207e33fa SHA512 0f7409a48b64030c492e9600112e54a0e01b440b450b15dc2137b72971883f53bc27c3ddf591c29784c7c62673d40c37ebe6a86a21b29a64f67d82804573f009 WHIRLPOOL 6d2301aeb4a2cc53bec922f058ee58f68aaa0a4075ffdce03d5c6f249b90c7901949d3d2598c02e8287ceb6c02e3dccc673886eeaedee900882e55880e5577c3 DIST percona-server-5.5.37-35.1.tar.gz 22938620 SHA256 3a08c4148a42489aab1df692f37eb1a34c2a55eb6b3fc8706f2c1c9966bf181a SHA512 b94d622a78903557c72bda6029943525516aa132758f6a97b9d4c28dd0e06fca50ae06f7bae5842185e9e2943c483ea2ef304e6570c4a4648258a66611db8cf4 WHIRLPOOL 9a2168533c2cf759c7fc96f03d36863ac59f1b4548e946f41c7e5234634ac11b16036f7a855328cf7634ad79f6d6afe239617af2a5b527060d5fa48e552b65d0 -DIST percona-server-5.6.17-65.0.tar.gz 34602183 SHA256 e4246f6773330376e0548bc5d6d590e822e7be9d6fc8ceeece8f4feeafd2b9a3 SHA512 c184821c9715cb8127963e375513ec2473d2dff7f6fa7493aaacb1ea562a6cbba0e90797f1988cb44e3bca22566782efe3bd23608d416a3562a67b6fbc5e01ca WHIRLPOOL d4424b618ad697a98648f301df43e8ceae8b789837ae9388214b3ae4629eba2af27e307dfd8880c5c17f3a3cbf650300b397c8c354247cdee48135985a2e0f48 +DIST percona-server-5.6.19-67.0.tar.gz 34127811 SHA256 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 SHA512 62b08b074d94f19e28e6aaf73f1419ecf589bd441b75efa7f27dad78705623b6002f5fd510832afb821d70315c7537042977cfbbab5317dfb1f6aca6d4224dc5 WHIRLPOOL a36725f1500125e4a7ce3714cc1b67c9bd90180e4eb0fce2237a8cbebb956a5d014934aa9b405f510fc3514a6a7dffb1301394c21b3ec129517ba25090ffc0d1 diff --git a/dev-db/percona-server/percona-server-5.6.17.65.0.ebuild b/dev-db/percona-server/percona-server-5.6.19.67.0.ebuild similarity index 100% rename from dev-db/percona-server/percona-server-5.6.17.65.0.ebuild rename to dev-db/percona-server/percona-server-5.6.19.67.0.ebuild
[gentoo-commits] proj/mysql:master commit in: profiles/
commit: 4ae1d90f3f694df4326f1afb1c538ffa64fdea7b Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Mon Jul 7 19:22:28 2014 + Commit: Brian Evans grknight AT tuffmail DOT com CommitDate: Mon Jul 7 19:22:28 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4ae1d90f Update overlay mask for testing --- profiles/package.mask | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 9f43e7b..160974a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,9 +1,9 @@ # Brian Evans grkni...@tuffmail.com (16 Dec 2013) # Add percona-server to the mask until the virtual is unmasked -=dev-db/percona-server-5.6 +=dev-db/percona-server-5.7 # Robin H. Johnson robb...@gentoo.org (04 Mar 2013) # Only 5.6 remains masked. -=dev-db/mariadb-5.6 -=dev-db/mysql-5.6 -=virtual/mysql-5.6 +=dev-db/mariadb-10.1 +=dev-db/mysql-5.7 +=virtual/mysql-5.7
[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/
commit: c5fcc8693b493e347a81570cb15e0cca51f2714a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Jul 8 15:16:47 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Tue Jul 8 15:16:47 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c5fcc869
[percona] Version bump for 5.5 series. 1 test timeout
---
dev-db/percona-server/Manifest| 2 +-
...na-server-5.5.37.35.1.ebuild = percona-server-5.5.38.35.2.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index e10cdee..c42002e 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,4 +1,4 @@
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
DIST mysql-extras-20140509-0130Z.tar.bz2 1493031 SHA256
e7b1b0f7556c3230e7ce7c971c4562de0e5ea706301cc107b4d23136207e33fa SHA512
0f7409a48b64030c492e9600112e54a0e01b440b450b15dc2137b72971883f53bc27c3ddf591c29784c7c62673d40c37ebe6a86a21b29a64f67d82804573f009
WHIRLPOOL
6d2301aeb4a2cc53bec922f058ee58f68aaa0a4075ffdce03d5c6f249b90c7901949d3d2598c02e8287ceb6c02e3dccc673886eeaedee900882e55880e5577c3
-DIST percona-server-5.5.37-35.1.tar.gz 22938620 SHA256
3a08c4148a42489aab1df692f37eb1a34c2a55eb6b3fc8706f2c1c9966bf181a SHA512
b94d622a78903557c72bda6029943525516aa132758f6a97b9d4c28dd0e06fca50ae06f7bae5842185e9e2943c483ea2ef304e6570c4a4648258a66611db8cf4
WHIRLPOOL
9a2168533c2cf759c7fc96f03d36863ac59f1b4548e946f41c7e5234634ac11b16036f7a855328cf7634ad79f6d6afe239617af2a5b527060d5fa48e552b65d0
+DIST percona-server-5.5.38-35.2.tar.gz 22946764 SHA256
2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d SHA512
5813736a4b0a74d20f1fbce9a30b023c55c3e7d5c300608d2b0445568c2034c77f3d97951503cc9d568aa0eea2516bb459b0a2d9a0ea161da561c0aaf3fb
WHIRLPOOL
25b1680f7a8c1b8290fc7a9a2a0fb0556f88591da108d6b524f6ae18da7c6e155cf1c03516a2234529eba0f454715b88302495c53ce793e9823485e1ccbc31e9
DIST percona-server-5.6.19-67.0.tar.gz 34127811 SHA256
5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 SHA512
62b08b074d94f19e28e6aaf73f1419ecf589bd441b75efa7f27dad78705623b6002f5fd510832afb821d70315c7537042977cfbbab5317dfb1f6aca6d4224dc5
WHIRLPOOL
a36725f1500125e4a7ce3714cc1b67c9bd90180e4eb0fce2237a8cbebb956a5d014934aa9b405f510fc3514a6a7dffb1301394c21b3ec129517ba25090ffc0d1
diff --git a/dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
b/dev-db/percona-server/percona-server-5.5.38.35.2.ebuild
similarity index 96%
rename from dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
rename to dev-db/percona-server/percona-server-5.5.38.35.2.ebuild
index bacb017..bfa704f 100644
--- a/dev-db/percona-server/percona-server-5.5.37.35.1.ebuild
+++ b/dev-db/percona-server/percona-server-5.5.38.35.2.ebuild
@@ -77,13 +77,13 @@ src_test() {
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource
limits.
#
- # main.percona_bug1289599
+ # main.percona_bug1289599 main.percona_innodb_version
# Appears to be a syntax error in the test file itself
#
for t in main.mysql_client_test \
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin main.percona_bug1289599 ; do
+ main.mysqld--help-notwin main.percona_bug1289599
main.percona_innodb_version ; do
mysql-v2_disable_test $t False positives in
Gentoo
done
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 2866c44052f745e4cdd7d7b10ee4f2360aeaa658 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Thu Apr 17 18:58:39 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Thu Apr 17 18:58:39 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=2866c440 Renable mysql_config patch for testing Signed-off-by: Brian Evans grknight AT tuffmail.com --- 0_index.txt | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/0_index.txt b/0_index.txt index 17cac9f..dc34ce8 100644 --- a/0_index.txt +++ b/0_index.txt @@ -240,16 +240,16 @@ @pn mariadb @@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS -#@patch 01050_all_mariadb_mysql_config_cleanup-5.5.patch -#@ver 5.05.00.00 to 10.00.99.99 -#@pn mariadb -#@pn mariadb-galera -#@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS - -#@patch 01050_all_mysql_config_cleanup-5.5.patch -#@ver 5.05.00.00 to 5.05.99.99 -#@pn mysql -#@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS +@patch 01050_all_mariadb_mysql_config_cleanup-5.5.patch +@ver 5.05.00.00 to 10.00.99.99 +@pn mariadb +@pn mariadb-galera +@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS + +@patch 01050_all_mysql_config_cleanup-5.5.patch +@ver 5.05.00.00 to 5.05.99.99 +@pn mysql +@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS @patch 02000_all_query-logging-bypass-4.1.19.patch @ver 4.01.14.00 to 4.01.99.99
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 6f0435c30079826df1d7fcbf3e6419ef2a3043b9 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Fri Apr 18 15:28:00 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Fri Apr 18 15:28:00 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=6f0435c3 Fix myodbc compilation due to missing symbol Signed-off-by: Brian Evans grknight AT tuffmail.com --- 0_index.txt | 7 +++ 20009_all_mariadb_myodbc_symbol_fix.patch | 10 ++ 2 files changed, 17 insertions(+) diff --git a/0_index.txt b/0_index.txt index dc34ce8..883b33d 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1641,3 +1641,10 @@ @pn mysql @pn percona-server @@ Backport tzinfo symlink fix from MariaDB bug 491176 + +@patch 20009_all_mariadb_myodbc_symbol_fix.patch +@ver 5.05.37.00 to 10.99.99.99 +@pn mariadb +@pn mariadb-galera +@@ Export missing symbol my_charset_latin1 +@@ MariaDB bug MDEV-6131 diff --git a/20009_all_mariadb_myodbc_symbol_fix.patch b/20009_all_mariadb_myodbc_symbol_fix.patch new file mode 100644 index 000..1ae1c8e --- /dev/null +++ b/20009_all_mariadb_myodbc_symbol_fix.patch @@ -0,0 +1,10 @@ +--- a/libmysql/CMakeLists.txt 2014-04-18 11:23:20.792196748 -0400 b/libmysql/CMakeLists.txt 2014-04-18 11:01:32.743379333 -0400 +@@ -261,6 +261,7 @@ + mysql_get_charset + mysql_get_charset_by_csname + mysql_net_realloc ++my_charset_latin1 + + # PHP's mysqli.so requires this (via the ER() macro) + mysql_client_errors
[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/
commit: 7515e4ec76382418d4746c5c22c150e27360f8a1
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu Apr 17 20:18:56 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Apr 17 20:18:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7515e4ec
[myodbc] Version bump
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/myodbc/Manifest | 2 +-
dev-db/myodbc/{myodbc-5.2.5.ebuild = myodbc-5.2.6.ebuild} | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ed3dbfb..f52d0b6 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1 @@
-DIST mysql-connector-odbc-5.2.5-src.tar.gz 581313 SHA256
54e35c646bb4d972bc18fba40d486059aac336d838269bef8049d1d78ebfb96a SHA512
a503df647690073e5b6b02ea49b3db380e6524388addd37b9993dcc0d0fb325c0d1e0954bbbc5a01e5d59c1ee20aab021dce731f89debfe07e61f9caad31e5cc
WHIRLPOOL
f3c0e42760142436c84756f2c75c2351185be7ade9101d0ff6ecdd762d6421f01d8ce333673edef4a84c6b2c832a52e5ac47ec8403df376ba15df8e60480bed1
+DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256
005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512
9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5
WHIRLPOOL
d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330
diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild
b/dev-db/myodbc/myodbc-5.2.6.ebuild
similarity index 96%
rename from dev-db/myodbc/myodbc-5.2.5.ebuild
rename to dev-db/myodbc/myodbc-5.2.6.ebuild
index 0dfdd64..7d1ee67 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.6.ebuild
@@ -43,7 +43,9 @@ src_prepare() {
src_configure() {
# The RPM_BUILD flag does nothing except install to /usr/lib64 when
x86_64
+ # MYSQL_CXX_LINKAGE expects mysql_config --cxxflags which doesn't
exist on MariaDB
mycmakeargs+=(
+ -DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
-DRPM_BUILD=1
-DMYSQL_LIB=$(mysql_config
--variable=pkglibdir)/libmysqlclient_r.so
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: cceab9b8e72b1a23e76e812406b3210c3fe19f88
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Fri Apr 18 17:00:30 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Fri Apr 18 17:00:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cceab9b8
[mariadb-galera] Version bump to 10.0.7 alpha
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb-galera/Manifest | 1 +
.../mariadb-galera-10.0.7_alpha.ebuild | 115 +
2 files changed, 116 insertions(+)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 3012b7e..6bc42ca 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,2 +1,3 @@
+DIST mariadb-galera-10.0.7.tar.gz 51553678 SHA256
93e334af054e053ba2f323a01bb8673e9661fa21e0c4a5467313f5722b274b31 SHA512
641bcf5572f425cb5a7e8a82ac25ec3e5faff726bd34d0ae913d6de8f6f2550ffbae29c927c705b32f0e46ac94587117cb28745e383be4b5dc815020fec7cfd2
WHIRLPOOL
3d96b87dbbcc8b1ef32a7581e09224f835fa9f73b73adc4639e6b01d451ae12570399456e1c4b0787b389d9db57460d931ba533a3eb0361af821c07a5b2f067a
DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256
ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512
78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09
WHIRLPOOL
fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256
3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512
49d9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4
WHIRLPOOL
c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild
new file mode 100644
index 000..989fab2
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER=live
+WSREP_REVISION=25
+
+# Build system
+BUILD=cmake
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE=$IUSE
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS=~amd64 ~x86
+
+# 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='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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 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 MariaDB 10.0 for now and are believed to
be
+ # false positives:
+ #
+ # main.information_schema,
binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, funcs_1.is_triggers,
funcs_1.is_tables_mysql,
+ # funcs_1.is_columns_mysql
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 500e4008ac671e0f2065a9204ea1333938730532
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 22 13:58:15 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 22 13:58:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=500e4008
[eclass] MariaDB has shuffled source locations
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-v2.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 92106aa..879ff9b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -131,6 +131,7 @@ if [[ -z ${SERVER_URI} ]]; then
MARIA_FULL_P=${PN}-${MARIA_FULL_PV}
SERVER_URI=
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: e2afb8144562c50751b697b932f4a15991ae4201
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 22 18:08:18 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 22 18:08:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e2afb814
[mariadb-galera] Version bump, 1 test fail:
sys_vars.auto_increment_increment_func
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb-galera/Manifest | 1 +
.../mariadb-galera-10.0.10_beta.ebuild | 115 +
2 files changed, 116 insertions(+)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 6bc42ca..106c327 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,3 +1,4 @@
+DIST mariadb-galera-10.0.10.tar.gz 52124329 SHA256
f3120440a20d535798e08e2b4fd25f8bf05c7cc2d094c2bdf7384454354f4a96 SHA512
c99b3a9287b6b2ccacc6cfd9078bdc492f3c3e0a23963a07d2ff052ac3baf78e83283f73f771ce9d9ca32a600d440e3956005df047a332993b3c4942ce9e5e43
WHIRLPOOL
e52aac77da09cde10288345b3b8fbc7e3a13fc0e26e7d63774aed04b8a79b8e9a7c0f3f2c4f1e2dfcb37984d9086a281a67ee2f8bb299d2186734700a1cad397
DIST mariadb-galera-10.0.7.tar.gz 51553678 SHA256
93e334af054e053ba2f323a01bb8673e9661fa21e0c4a5467313f5722b274b31 SHA512
641bcf5572f425cb5a7e8a82ac25ec3e5faff726bd34d0ae913d6de8f6f2550ffbae29c927c705b32f0e46ac94587117cb28745e383be4b5dc815020fec7cfd2
WHIRLPOOL
3d96b87dbbcc8b1ef32a7581e09224f835fa9f73b73adc4639e6b01d451ae12570399456e1c4b0787b389d9db57460d931ba533a3eb0361af821c07a5b2f067a
DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256
ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512
78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09
WHIRLPOOL
fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256
3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512
49d9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4
WHIRLPOOL
c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild
new file mode 100644
index 000..989fab2
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MY_EXTRAS_VER=live
+WSREP_REVISION=25
+
+# Build system
+BUILD=cmake
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE=$IUSE
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS=~amd64 ~x86
+
+# 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='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ 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 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 MariaDB 10.0 for now and are believed
[gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/
commit: aca4a94658fca0accc041f208806f2f4bb22a113
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 22 14:47:10 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 22 14:47:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=aca4a946
[galera] Version bump and whitespace
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
sys-cluster/galera/Manifest| 1 +
sys-cluster/galera/galera-25.3.2.ebuild| 6 +++---
.../galera/{galera-25.3.2.ebuild = galera-25.3.5.ebuild} | 10 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index cad5a56..cc53fd8 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,4 @@
DIST galera-23.2.4-src.tar.gz 3061934 SHA256
83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512
b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711
WHIRLPOOL
3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2
DIST galera-23.2.7-src.tar.gz 3140705 SHA256
b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512
15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc
WHIRLPOOL
011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482
DIST galera-25.3.2-src.tar.gz 3808803 SHA256
5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d SHA512
784476938d8d57e865685f3a43ed95d1aeed151dd145476bc094d5a132c87bdaab2cd9c8aac610adc4c847dfbf814b0d59cddaa68b73c741fd6918738f52f545
WHIRLPOOL
01c51a6ba5f069890e9c529bde7d7ce7bb7e16997779ab074be592257792f5c5d3d146e228548a2db31acf5fab0d7e410506118f03c2fdb44004fb364a3cc6fa
+DIST galera-25.3.5-src.tar.gz 3820268 SHA256
9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512
34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995
WHIRLPOOL
055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
diff --git a/sys-cluster/galera/galera-25.3.2.ebuild
b/sys-cluster/galera/galera-25.3.2.ebuild
index 4b96af4..b0e73ea 100644
--- a/sys-cluster/galera/galera-25.3.2.ebuild
+++ b/sys-cluster/galera/galera-25.3.2.ebuild
@@ -48,15 +48,15 @@ pkg_preinst() {
src_prepare() {
# Remove bundled dev-cpp/asio
rm -fr ${S}/asio
-
+
# Respect {C,LD}FLAGS.
epatch ${FILESDIR}/respect-flags.patch
-
+
#Remove optional garbd daemon
if ! use garbd ; then
rm -fr ${S}/garb
fi
-
+
epatch_user
}
diff --git a/sys-cluster/galera/galera-25.3.2.ebuild
b/sys-cluster/galera/galera-25.3.5.ebuild
similarity index 96%
copy from sys-cluster/galera/galera-25.3.2.ebuild
copy to sys-cluster/galera/galera-25.3.5.ebuild
index 4b96af4..2876d0d 100644
--- a/sys-cluster/galera/galera-25.3.2.ebuild
+++ b/sys-cluster/galera/galera-25.3.5.ebuild
@@ -47,16 +47,16 @@ pkg_preinst() {
src_prepare() {
# Remove bundled dev-cpp/asio
- rm -fr ${S}/asio
-
+ rm -r ${S}/asio || die
+
# Respect {C,LD}FLAGS.
epatch ${FILESDIR}/respect-flags.patch
-
+
#Remove optional garbd daemon
if ! use garbd ; then
- rm -fr ${S}/garb
+ rm -r ${S}/garb || die
fi
-
+
epatch_user
}
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 40af541360ce070aa32ae5249695c46f4818048d
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Apr 23 13:18:14 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Apr 23 13:18:14 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40af5413
[eclass] Fix potential issue for future gcc versions in pkg_setup
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-multilib.eclass | 2 +-
eclass/mysql-v2.eclass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index e2dd614..9a2f94c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -347,7 +347,7 @@ mysql-multilib_pkg_setup() {
mysql_version_is_at_least 7.2.9 java-pkg-opt-2_pkg_setup
fi
- if use_if_iuse tokudb [[ $(gcc-version) 4.7 ]] ; then
+ if use_if_iuse tokudb [[ $(gcc-major-version) -lt 4 ||
$(gcc-major-version) -eq 4 $(gcc-minor-version) -lt 7 ]] ; then
eerror ${PN} with tokudb needs to be built with gcc-4.7 or
later.
eerror Please use gcc-config to switch to gcc-4.7 or later
version.
die
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 879ff9b..1830130 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -479,7 +479,7 @@ mysql-v2_pkg_setup() {
mysql_version_is_at_least 7.2.9 java-pkg-opt-2_pkg_setup
fi
- if use_if_iuse tokudb [[ $(gcc-version) 4.7 ]] ; then
+ if use_if_iuse tokudb [[ $(gcc-major-version) -lt 4 ||
$(gcc-major-version) -eq 4 $(gcc-minor-version) -lt 7 ]] ; then
eerror ${PN} with tokudb needs to be built with gcc-4.7 or
later.
eerror Please use gcc-config to switch to gcc-4.7 or later
version.
die
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 3cc8988d513b07c32a26334c00c29d6dd141da3b
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Apr 23 16:20:11 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Apr 23 16:20:11 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=3cc8988d
Respin minimal patch for mysql 5.6
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
0_index.txt | 6
20001_all_fix-minimal-build-cmake-mysql-5.6.patch | 41 +++
2 files changed, 47 insertions(+)
diff --git a/0_index.txt b/0_index.txt
index 883b33d..45589ac 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1485,6 +1485,12 @@
@pn percona-server
@@ Fix the minimal build by reordering CMakeLists.txt
+@patch 20001_all_fix-minimal-build-cmake-mysql-5.6.patch
+@ver 5.06.17.00 to 5.06.99.99
+@pn mysql
+@pn percona-server
+@@ Fix the minimal build by reordering CMakeLists.txt
+
@patch 20001_all_fix-minimal-build-cmake-mariadb.patch
@ver 5.05.00.00 to 5.05.26.99
@pn mariadb
diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.6.patch
b/20001_all_fix-minimal-build-cmake-mysql-5.6.patch
new file mode 100644
index 000..55cdbdd
--- /dev/null
+++ b/20001_all_fix-minimal-build-cmake-mysql-5.6.patch
@@ -0,0 +1,41 @@
+--- a/CMakeLists.txt 2014-04-23 12:12:15.373173849 -0400
b/CMakeLists.txt 2014-04-23 12:14:45.448393844 -0400
+@@ -454,6 +454,14 @@
+ ADD_SUBDIRECTORY(mysys)
+ ADD_SUBDIRECTORY(mysys_ssl)
+ ADD_SUBDIRECTORY(libmysql)
++ADD_SUBDIRECTORY(client)
++ADD_SUBDIRECTORY(sql/share)
++ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(support-files)
++ADD_SUBDIRECTORY(scripts)
++IF(UNIX)
++ ADD_SUBDIRECTORY(man)
++ENDIF()
+
+ IF(WITH_UNIT_TESTS)
+ ADD_SUBDIRECTORY(unittest)
+@@ -470,10 +478,7 @@
+ ADD_SUBDIRECTORY(extra)
+ IF(NOT WITHOUT_SERVER)
+ ADD_SUBDIRECTORY(tests)
+- ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(sql)
+- ADD_SUBDIRECTORY(sql/share)
+- ADD_SUBDIRECTORY(libservices)
+ OPTION (WITH_EMBEDDED_SERVER Compile MySQL with embedded server OFF)
+ IF(WITH_EMBEDDED_SERVER)
+ADD_SUBDIRECTORY(libmysqld)
+@@ -482,12 +487,7 @@
+
+ ADD_SUBDIRECTORY(mysql-test)
+ ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+- ADD_SUBDIRECTORY(support-files)
+- ADD_SUBDIRECTORY(scripts)
+ ADD_SUBDIRECTORY(sql-bench)
+- IF(UNIX)
+-ADD_SUBDIRECTORY(man)
+- ENDIF()
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+ ADD_SUBDIRECTORY(internal)
+ ENDIF()
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/, dev-db/percona-server/
commit: fc715892e5847b78e7a206d69501b67e465a8500 Author: Brian Evans grknight AT tuffmail DOT com AuthorDate: Thu Apr 24 13:03:23 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Thu Apr 24 13:03:23 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fc715892 Use mysql-extras release Signed-off-by: Brian Evans grknight AT tuffmail.com --- dev-db/mariadb-galera/Manifest | 1 + dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild | 2 +- dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild | 2 +- dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild | 2 +- dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild | 2 +- dev-db/percona-server/Manifest | 1 + dev-db/percona-server/percona-server-5.5.36.34.2.ebuild | 2 +- dev-db/percona-server/percona-server-5.6.16.64.2.ebuild | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest index 106c327..79dc55c 100644 --- a/dev-db/mariadb-galera/Manifest +++ b/dev-db/mariadb-galera/Manifest @@ -2,3 +2,4 @@ DIST mariadb-galera-10.0.10.tar.gz 52124329 SHA256 f3120440a20d535798e08e2b4fd25 DIST mariadb-galera-10.0.7.tar.gz 51553678 SHA256 93e334af054e053ba2f323a01bb8673e9661fa21e0c4a5467313f5722b274b31 SHA512 641bcf5572f425cb5a7e8a82ac25ec3e5faff726bd34d0ae913d6de8f6f2550ffbae29c927c705b32f0e46ac94587117cb28745e383be4b5dc815020fec7cfd2 WHIRLPOOL 3d96b87dbbcc8b1ef32a7581e09224f835fa9f73b73adc4639e6b01d451ae12570399456e1c4b0787b389d9db57460d931ba533a3eb0361af821c07a5b2f067a DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256 3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512 49d9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4 WHIRLPOOL c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641 +DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild index 989fab2..187b7a4 100644 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=4 -MY_EXTRAS_VER=live +MY_EXTRAS_VER=20140424-1043Z WSREP_REVISION=25 # Build system diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild index 989fab2..187b7a4 100644 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.7_alpha.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=4 -MY_EXTRAS_VER=live +MY_EXTRAS_VER=20140424-1043Z WSREP_REVISION=25 # Build system diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild index e1bf28b..ee20d86 100644 --- a/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=4 -MY_EXTRAS_VER=live +MY_EXTRAS_VER=20140424-1043Z WSREP_REVISION=23 # Build system diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild index 801fd97..973fd6b 100644 --- a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=4 -MY_EXTRAS_VER=live +MY_EXTRAS_VER=20140424-1043Z WSREP_REVISION=25 # Build system diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index f2be9e8..35a6fac 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,2 +1,3 @@ +DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: d2a5ec77e428e6a0413c7fcbe6e6bc7e2e6f6667
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Sat Apr 26 00:57:35 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat Apr 26 00:57:35 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=d2a5ec77
Fix embedded library location in ELIB patches for 5.5
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
20006_all_cmake_elib-mariadb-5.5.33.patch | 49 +++
20006_all_cmake_elib-mysql-5.5.37.patch | 49 +++
2 files changed, 98 insertions(+)
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch
b/20006_all_cmake_elib-mariadb-5.5.33.patch
index 33e902b..ae6447f 100644
--- a/20006_all_cmake_elib-mariadb-5.5.33.patch
+++ b/20006_all_cmake_elib-mariadb-5.5.33.patch
@@ -151,3 +151,52 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
IF(UNIX)
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
+diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
+--- a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
+@@ -198,6 +198,7 @@
+ SET(scriptdir ${prefix}/${INSTALL_BINDIR})
+ SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
+ SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR})
+ IF(INSTALL_LAYOUT MATCHES STANDALONE)
+ SET(localstatedir ${prefix}/data)
+ ELSE()
+diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
+--- a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0 -0400
b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
+@@ -190,9 +190,10 @@
+ else
+ {
+ my $linkpath = -L$pkglibdir @RPATH_OPTION@;
++ my $elinkpath = -L@elibdir@ @RPATH_OPTION@;
+ @lib_opts = ($linkpath,-lmysqlclient);
+ @lib_r_opts = ($linkpath,-lmysqlclient_r);
+- @lib_e_opts = ($linkpath,-lmysqld);
++ @lib_e_opts = ($elinkpath,-lmysqld);
+ }
+
+ my $flags;
+diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
+--- a/mysql/scripts/mysql_config.sh2014-04-25 20:05:16.0 -0400
b/mysql/scripts/mysql_config.sh2014-04-25 20:08:01.0 -0400
+@@ -91,6 +91,10 @@
+ plugindir_rel=`echo $plugindir | sed -e s;^$basedir/;;`
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+
++elibdir='@elibdir@'
++elibdir_rel=`echo $elibdir | sed -e s;^$basedir/;;`
++fix_path elibdir $elibdir_rel lib64/mysql lib64 lib/mysql lib
++
+ pkgincludedir='@pkgincludedir@'
+ fix_path pkgincludedir include/mysql
+
+@@ -109,7 +113,7 @@
+ libs= $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@
@NON_THREADED_LIBS@
+ libs=$libs @openssl_libs@ @STATIC_NSS_FLAGS@
+ libs_r= $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@
@CLIENT_LIBS@ @openssl_libs@
+-embedded_libs= $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@
@ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@
++embedded_libs= $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@
@ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@
+
+ if [ -r $pkglibdir/libmygcc.a ]; then
+ # When linking against the static library with a different version of GCC
diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch
b/20006_all_cmake_elib-mysql-5.5.37.patch
index a56805c..d712067 100644
--- a/20006_all_cmake_elib-mysql-5.5.37.patch
+++ b/20006_all_cmake_elib-mysql-5.5.37.patch
@@ -170,3 +170,52 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT
Development)
+ENDIF()
+diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
+--- a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
+@@ -198,6 +198,7 @@
+ SET(scriptdir ${prefix}/${INSTALL_BINDIR})
+ SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
+ SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
++SET(elibdir ${prefix}/${INSTALL_ELIBDIR})
+ IF(INSTALL_LAYOUT MATCHES STANDALONE)
+ SET(localstatedir ${prefix}/data)
+ ELSE()
+diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
+--- a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0 -0400
b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
+@@ -190,9 +190,10 @@
+ else
+ {
+ my $linkpath = -L$pkglibdir @RPATH_OPTION@;
++ my $elinkpath = -L@elibdir@ @RPATH_OPTION@;
+ @lib_opts = ($linkpath,-lmysqlclient);
+ @lib_r_opts = ($linkpath,-lmysqlclient_r);
+- @lib_e_opts = ($linkpath,-lmysqld);
++ @lib_e_opts = ($elinkpath,-lmysqld);
+ }
+
+ my $flags;
+diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
+--- a/mysql/scripts
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: c70f878ff23d999347f96d312ead0c8c56851684
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Sat Apr 26 01:25:54 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat Apr 26 01:25:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=c70f878f
Fix embedded library location in ELIB patches for 5.5
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
20006_all_cmake_elib-mariadb-5.5.33.patch | 12 ++--
20006_all_cmake_elib-mysql-5.5.37.patch | 12 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch
b/20006_all_cmake_elib-mariadb-5.5.33.patch
index ae6447f..5658444 100644
--- a/20006_all_cmake_elib-mariadb-5.5.33.patch
+++ b/20006_all_cmake_elib-mariadb-5.5.33.patch
@@ -152,8 +152,8 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
-+++ b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
@@ -198,6 +198,7 @@
SET(scriptdir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
@@ -163,8 +163,8 @@ diff -aurN a/mysql/scripts/CMakeLists.txt
b/mysql/scripts/CMakeLists.txt
SET(localstatedir ${prefix}/data)
ELSE()
diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0 -0400
-+++ b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
+--- mysql-old/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0
-0400
mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
@@ -190,9 +190,10 @@
else
{
@@ -178,8 +178,8 @@ diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
my $flags;
diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
a/mysql/scripts/mysql_config.sh2014-04-25 20:05:16.0 -0400
-+++ b/mysql/scripts/mysql_config.sh2014-04-25 20:08:01.0 -0400
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.0 -0400
mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.0 -0400
@@ -91,6 +91,10 @@
plugindir_rel=`echo $plugindir | sed -e s;^$basedir/;;`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch
b/20006_all_cmake_elib-mysql-5.5.37.patch
index d712067..1f328c2 100644
--- a/20006_all_cmake_elib-mysql-5.5.37.patch
+++ b/20006_all_cmake_elib-mysql-5.5.37.patch
@@ -171,8 +171,8 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
+ENDIF()
diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt
a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
-+++ b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
+--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.0 -0400
mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.0 -0400
@@ -198,6 +198,7 @@
SET(scriptdir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
@@ -182,8 +182,8 @@ diff -aurN a/mysql/scripts/CMakeLists.txt
b/mysql/scripts/CMakeLists.txt
SET(localstatedir ${prefix}/data)
ELSE()
diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0 -0400
-+++ b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
+--- mysql-old/scripts/mysql_config.pl.in 2014-04-15 07:02:39.0
-0400
mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.0 -0400
@@ -190,9 +190,10 @@
else
{
@@ -197,8 +197,8 @@ diff -aurN a/mysql/scripts/mysql_config.pl.in
b/mysql/scripts/mysql_config.pl.in
my $flags;
diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh
a/mysql/scripts/mysql_config.sh2014-04-25 20:05:16.0 -0400
-+++ b/mysql/scripts/mysql_config.sh2014-04-25 20:08:01.0 -0400
+--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.0 -0400
mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.0 -0400
@@ -91,6 +91,10 @@
plugindir_rel=`echo $plugindir | sed -e s;^$basedir/;;`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 67e9c375faa7e02492a170f856cb140f32d27e1f
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Sat Apr 26 03:53:23 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat Apr 26 03:53:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=67e9c375
Fix embedded library location in ELIB patches for overlay only ebuilds
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
20006_all_cmake_elib-mariadb-10.0.7.patch | 188 +-
20006_all_cmake_elib-mysql-5.6.15.patch | 34 ++
20006_all_cmake_elib-percona-5.5.36.patch | 34 ++
20006_all_cmake_elib-percona-5.6.16.patch | 34 ++
4 files changed, 289 insertions(+), 1 deletion(-)
diff --git a/20006_all_cmake_elib-mariadb-10.0.7.patch
b/20006_all_cmake_elib-mariadb-10.0.7.patch
deleted file mode 12
index fe5632d..000
--- a/20006_all_cmake_elib-mariadb-10.0.7.patch
+++ /dev/null
@@ -1 +0,0 @@
-20006_all_cmake_elib-mariadb-5.5.33.patch
\ No newline at end of file
diff --git a/20006_all_cmake_elib-mariadb-10.0.7.patch
b/20006_all_cmake_elib-mariadb-10.0.7.patch
new file mode 100644
index 000..9b02ee5
--- /dev/null
+++ b/20006_all_cmake_elib-mariadb-10.0.7.patch
@@ -0,0 +1,187 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470
-0100
mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100
+@@ -44,7 +44,8 @@
+ # - INSTALL_SYSCONFDIR(my.cnf config file. Usually /etc or
nothing)
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -120,6 +121,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include/mysql)
+@@ -150,9 +152,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -183,6 +187,7 @@
+ SET(INSTALL_SYSCONF2DIR_DEB /etc/mysql/conf.d)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include/mysql)
+@@ -210,6 +215,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include/mysql)
+@@ -241,7 +247,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST
UNIX_ADDR)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100
mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100
+@@ -211,10 +211,11 @@
+ # [linklib1 linklibN]
+ # [EXPORTS exported_func1 exportedFuncN]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
+ #)
+ MACRO(MERGE_LIBRARIES)
+ MYSQL_PARSE_ARGUMENTS(ARG
+-EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION
++EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR
+ STATIC;SHARED;MODULE;NOINSTALL
+ ${ARGN}
+ )
+@@ -274,7 +275,11 @@
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ENDIF()
+-MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++IF(ARG_OUTPUT_DIR)
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${ARG_OUTPUT_DIR} ${COMP})
++ELSE()
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++ENDIF()
+ ENDIF()
+ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 624a43abfdb96d04ab29e097b8a126be3282a42f
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Fri Apr 25 01:58:12 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat Apr 26 19:10:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=624a43ab
[mysql] Drop old
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mysql/mysql-5.1.70.ebuild | 265 ---
dev-db/mysql/mysql-5.5.35.ebuild | 129 ---
2 files changed, 394 deletions(-)
diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
deleted file mode 100644
index 06c804b..000
--- a/dev-db/mysql/mysql-5.1.70.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# 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.69.ebuild,v 1.1
2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI=4
-
-MY_EXTRAS_VER=20130626-0127Z
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD=autotools
-
-inherit toolchain-funcs mysql-v2
-
-# 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 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND=|| ( =sys-devel/gcc-3.4.6 =sys-devel/gcc-apple-4.0 )
- =sys-devel/libtool-2.2.10
-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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- ${S}/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# 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() {
- # 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
-
- emake check || die make check failed
- 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
- cd ${S}
- einfo Test phase [test]: ${CATEGORY}/${PF}
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD=$((${RANDOM} % 100))
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql-v2_disable_test archive_gis Totally broken in
5.0.42
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ $(tc-endian) == big ] \
- mysql-v2_disable_test \
- archive_gis \
- Broken in 5.0.43-70 and 5.0.87 on big-endian
boxes only
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only
security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql-v2_disable_test \
- read_only \
- Broken in 5.0.51-54, output in wrong order
- ;;
- esac
-
- # Ditto to read_only
- [ ${PV} == 5.0.51a ] \
- mysql-v2_disable_test \
- view \
- Broken in 5.0.51, output in wrong order
-
- # x86-specific, OOM issue with some subselects on low memory
servers
- [ ${PV} == 5.0.54 ] \
- [ ${ARCH/x86} != ${ARCH} ] \
- mysql-v2_disable_test \
- subselect \
- Testcase needs tuning on x86 for oom condition
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: b5b9cc85253b7dcb6269ca846373b40f09353dd8
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Fri Apr 25 01:58:45 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat Apr 26 19:10:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b5b9cc85
[mariadb] Drop old
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb/mariadb-10.0.9_rc.ebuild | 110
1 file changed, 110 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
deleted file mode 100644
index d4a66b7..000
--- a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER=live
-
-# Build system
-BUILD=cmake
-
-inherit toolchain-funcs mysql-v2
-# 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 ~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 )
-RDEPEND=${RDEPEND}
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- 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 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 MariaDB 10.0 for now and are believed to
be
- # false positives:
- #
- # main.information_schema,
binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers,
funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock:
- # segfaults at random under Portage only, suspect resource
limits.
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock
\
- binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help plugins.unix_socket \
- funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
- mysql-v2_disable_test $t False positives in
Gentoo
- done
-
- # Run mysql tests
- pushd ${TESTDIR}
-
- # run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how
to reference data files
- perl mysql-test-run.pl --force
--vardir=${S}/mysql-test/var-tests --skip-test=connect
- 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
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: de8b563fc1c80a130f34f76faa0bc8837b2d158b
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Apr 28 18:10:06 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Apr 28 18:10:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b563f
[eclass] clean up dep for MariaDB 10
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-multilib.eclass | 1 -
eclass/mysql-v2.eclass | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1815e75..28df036 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -240,7 +240,6 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ;
then
fi
mysql_version_is_at_least 10.0.7 DEPEND=${DEPEND} oqgraph? (
dev-libs/judy:0= )
if mysql_version_is_at_least 10.0.9 ; then
- use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35:3=[static-libs] || \
DEPEND=${DEPEND} =dev-libs/libpcre-8.35:3=
fi
fi
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1830130..15faf6c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -274,8 +274,7 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]] ;
then
fi
mysql_version_is_at_least 10.0.7 DEPEND=${DEPEND} oqgraph? (
dev-libs/judy )
if mysql_version_is_at_least 10.0.9 ; then
- use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35[static-libs] || \
- DEPEND=${DEPEND} =dev-libs/libpcre-8.35
+ DEPEND=${DEPEND} =dev-libs/libpcre-8.35
fi
fi
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Apr 28 18:01:41 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Apr 28 18:01:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c072c4ef
[eclass] Convert multilib_build_binaries to multilib_is_native_abi
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-multilib.eclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 9a2f94c..1815e75 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -453,7 +453,7 @@ mysql-multilib_src_configure() {
configure_cmake_locale
- if multilib_build_binaries ; then
+ if multilib_is_native_abi ; then
if use minimal ; then
configure_cmake_minimal
else
@@ -493,7 +493,7 @@ mysql-multilib_src_configure() {
mysql-multilib_src_compile() {
#_mysql-multilib_src_compile() {
#
- # if ! multilib_build_binaries ; then
+ # if ! multilib_is_native_abi ; then
# BUILD_DIR=${BUILD_DIR}/libmysql
cmake-utils_src_compile
# else
# cmake-utils_src_compile
@@ -513,7 +513,7 @@ mysql-multilib_src_install() {
_mysql-multilib_src_install() {
debug-print-function ${FUNCNAME} $@
- if multilib_build_binaries; then
+ if multilib_is_native_abi; then
mysql-cmake_src_install
else
# BUILD_DIR=${BUILD_DIR}/libmysql
cmake-utils_src_install
@@ -522,7 +522,7 @@ mysql-multilib_src_install() {
insinto /usr/include/mysql/private
doins sql/*.h
fi
-
+
fi
# Do multilib magic only when 1 ABI is used.
if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-native-client/
commit: d798a31c68f75803740184271d56e9077bc705d2
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 29 17:20:42 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 29 17:20:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d798a31c
Remove RelWithDebInfo target to respect CFLAGS
---
dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
index 12a38e3..088c7ec 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
}
src_configure() {
- CMAKE_BUILD_TYPE=RelWithDebInfo
mycmakeargs+=(
-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-DWITH_EXTERNAL_ZLIB=ON
[gentoo-commits] proj/mysql:master commit in: dev-java/mariadb-java-client/files/, dev-java/mariadb-java-client/
commit: c54a922f9287333c7153e927b0605bb2f83a45b8
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue Apr 29 17:49:09 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue Apr 29 17:49:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c54a922f
[mariadb-java-client] Version bump, remove old.
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-java/mariadb-java-client/Manifest | 3 +-
dev-java/mariadb-java-client/files/maven-build.xml | 250 -
.../mariadb-java-client-1.1.3.ebuild | 46
...1.4.ebuild = mariadb-java-client-1.1.7.ebuild} | 2 +-
.../mariadb-java-client-.ebuild| 2 +-
5 files changed, 3 insertions(+), 300 deletions(-)
diff --git a/dev-java/mariadb-java-client/Manifest
b/dev-java/mariadb-java-client/Manifest
index e1bc387..ff507d7 100644
--- a/dev-java/mariadb-java-client/Manifest
+++ b/dev-java/mariadb-java-client/Manifest
@@ -1,2 +1 @@
-DIST mariadb-java-client-1.1.3.tar.gz 179751 SHA256
bb9927e3bacaa501e8a0a04ac1a93cccf43c64d4a4742d17b115b54869964076 SHA512
22ed23483b5ab741bfbd82825ce21cb55533c78fa8ea839effda2eca185f283b92a3b551a12761c3e00de6a0722e95c4ebd670462d553b33dbe9925541ae5b97
WHIRLPOOL
0896218d64c5e488322a745a7819c2f9c39d5b5ed677d013abae7270455caea0b4394d013d8ee17b8fb166679f1a3f89af6ff06e2a9d026f525df5088e813ffa
-DIST mariadb-java-client-1.1.4.tar.gz 184565 SHA256
6feec7634572577fed376a19927d05d5abea01aa81615451b259f4fec52d72cd SHA512
4be86df3949845f48741e98a5f1ef17d30229af15966f86e502890f01b05b518bbf0aad8814e50512554cbb318b1048dfa9ff3f5540c4a60c0059e526236
WHIRLPOOL
4966ae823933d2aefbcb2e86a1302b11b635def426500033e256277fd91a6ade0bfffe995b023a84b4c8fd448c3a78df7c2ea64f8c8e298dfc7f12a16662a42c
+DIST mariadb-java-client-1.1.7.tar.gz 187189 SHA256
5d0901777eabb477d65d9e1e123a8ade921c0dba486d26626c58b817bef05e82 SHA512
68f1cac13c508daedb03bb433a91d57526bd427f44f1fc2604095af1d947271d8328a44e82f64e6d93f474b4d7d9749f01810f2faf0027862554168d3a314aaa
WHIRLPOOL
36d4cbb073c08e703df19023f8b85089940cac8775c05fa41262b44948ac289d8c63014ef604b44642a74915406adaf3c3ccbaf4170fca60a58776004126647f
diff --git a/dev-java/mariadb-java-client/files/maven-build.xml
b/dev-java/mariadb-java-client/files/maven-build.xml
deleted file mode 100644
index 3251eb1..000
--- a/dev-java/mariadb-java-client/files/maven-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-
-!-- == --
-!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.--
-!-- == --
-
-!-- == --
-!-- = - DO NOT EDIT THIS FILE! - = --
-!-- == --
-!----
-!-- Any modifications will be overwritten. --
-!----
-!-- Generated by Maven Ant Plugin on 7/1/13 1:49 PM--
-!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --
-!----
-!-- == --
-
-project name=mariadb-java-client-from-maven default=package basedir=.
-
- !-- ==
--
- !-- Build environment properties
--
- !-- ==
--
-
- property file=${user.home}/.m2/maven.properties/
- property file=maven-build.properties/
-
- property name=maven.build.finalName value=mariadb-java-client/
- property name=maven.build.dir value=target/
- property name=maven.build.outputDir value=${maven.build.dir}/classes/
- property name=maven.build.srcDir.0 value=src/main/java/
- property name=maven.build.resourceDir.0 value=src/main/resources/
- property name=maven.build.testOutputDir
value=${maven.build.dir}/test-classes/
- property name=maven.build.testDir.0 value=src/test/java/
- property name=maven.build.testResourceDir.0 value=src/test/resources/
- property name=maven.test.reports value=${maven.build.dir}/test-reports/
- property name=maven.reporting.outputDirectory
value=${maven.build.dir}/site/
-
- property name=maven.repo.local value=${user.home}/.m2/repository/
- property name=maven.settings.offline value=false/
- property name=maven.settings.interactiveMode value=true/
-
- !-- ==
--
- !-- Defining classpaths
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: 444a0473fe52f76304ebe4b4a8c3b889057d58cc
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Jun 8 20:08:13 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sun Jun 8 20:08:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=444a0473
[mysql] Version bump on 5.5 and 5.6 series
---
dev-db/mysql/Manifest | 4 +-
...{mysql-5.5.37-r1.ebuild = mysql-5.5.38.ebuild} | 2 +-
dev-db/mysql/mysql-5.6.17.ebuild | 129 -
...{mysql-5.6.17-r1.ebuild = mysql-5.6.19.ebuild} | 4 +-
4 files changed, 5 insertions(+), 134 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5c4a1f0..fcfce95 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,8 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256
c79f83bed7c1ea98e018b8829375b55c1de838d
DIST mysql-4.1.22.tar.gz 17761101 SHA256
6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512
9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390
WHIRLPOOL
b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512
2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9
WHIRLPOOL
3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.17.tar.gz 32862539 SHA256
f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512
36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7
WHIRLPOOL
47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
+DIST mysql-5.5.38.tar.gz 21739681 SHA256
61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81 SHA512
7abaac21028d984a72b7f6a43e82fab38833094b6271fa6faadae09c6be23eba0df2151f32f8d94345d6b0bb172325995acab0185a9a85af8fd475bef4cee231
WHIRLPOOL
b1cb459790446423f510ab3ee18d39d178e438e03020faf0de1a7574d99c2648915f2c0e7503aa0288e128395880706a010fecc534a08cfd50cd49ecf7f67205
+DIST mysql-5.6.19.tar.gz 32879525 SHA256
80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f SHA512
1c60c7eaa2975d9812492a1e46f550a820c62f818a60adcbd3fc7b500799d28825e8ca17d678696ae0dcdf4df4e447fd93c64d2788dac97a6a40f3258e7d86b3
WHIRLPOOL
b2b353b65c84734c58f51063a4b4d5e6af33759f12bf169571d2ba6ed686d3fd37cc9018594839ca74f3180fc3982aebf2bbbdf599904e9a3cd9605c9d93b9f4
DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256
3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512
7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b
WHIRLPOOL
6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
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
diff --git a/dev-db/mysql/mysql-5.5.37-r1.ebuild
b/dev-db/mysql/mysql-5.5.38.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.5.37-r1.ebuild
rename to dev-db/mysql
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/
commit: 1294faa6dce163aa7cb4629f6c373343672b98e8 Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Mon Jun 9 01:09:43 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Mon Jun 9 01:09:43 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1294faa6 [mariadb] Remove extra my.cnf-4.1 which will never be used --- dev-db/mariadb/files/my.cnf-4.1 | 147 1 file changed, 147 deletions(-) diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1 deleted file mode 100644 index 211deaa..000 --- a/dev-db/mariadb/files/my.cnf-4.1 +++ /dev/null @@ -1,147 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $ - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysql] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqladmin] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlcheck] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqldump] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlimport] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlshow] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[myisamchk] -character-sets-dir=/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=/usr/share/mysql/charsets - -# use [safe_mysqld] with mysql-3 -[mysqld_safe] -err-log= /var/log/mysql/mysql.err - -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations -[mysqld] -character-set-server = utf8 -default-character-set = 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 -datadir= @DATADIR@ -skip-locking -key_buffer = 16M -max_allowed_packet = 1M -table_cache= 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size= 8M -language = /usr/share/mysql/english - -# security: -# using localhost in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -tmpdir = /tmp/ -#log-update= /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 -# this will show you *exactly* what's happening in your server ;) - -#log = /tmp/mysqld.sql -#gdb -#debug = d:t:i:o,/tmp/mysqld.trace -#one-thread - -# uncomment the following directives if you are using BDB tables -#bdb_cache_size= 4M -#bdb_max_lock = 1 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -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 -# 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/ -# 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 -# we keep
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: a6fc813816f0115c3911dce9db9d6ed66acaedac
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Wed Apr 30 20:38:59 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Apr 30 20:38:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a6fc8138
[eclass] Fix pkg_config for mysql 5.6+ (needs InnoDB)
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-multilib.eclass | 29 +
eclass/mysql-v2.eclass | 31 ++-
2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 28df036..d89e15a 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -747,7 +747,7 @@ mysql-multilib_pkg_config() {
helpfile=${TMPDIR}/mysqld-help
${EROOT}/usr/sbin/mysqld --verbose --help ${helpfile} 2/dev/null
for opt in grant-tables host-cache name-resolve networking slave-start \
- federated innodb ssl log-bin relay-log slow-query-log
external-locking \
+ federated ssl log-bin relay-log slow-query-log external-locking
\
ndbcluster log-slave-updates \
; do
optexp=--(skip-)?${opt} optfull=--loose-skip-${opt}
@@ -763,6 +763,22 @@ mysql-multilib_pkg_config() {
use prefix [[ -f ${MY_SYSCONFDIR}/my.cnf ]] \
options=${options}
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
+ # MySQL 5.6+ needs InnoDB
+ if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
+ mysql_version_is_at_least 5.6 || options=${options}
--loose-skip-innodb
+ fi
+
+ einfo Creating the mysql database and setting proper
+ einfo permissions on it ...
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists
before using it
+ PID_DIR=${EROOT}/var/run/mysqld
+ if [[ ! -d ${PID_DIR} ]]; then
+ mkdir -p ${PID_DIR}
+ chown mysql:mysql ${PID_DIR}
+ chmod 755 ${PID_DIR}
+ fi
+
pushd ${TMPDIR} /dev/null
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db'
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
@@ -789,17 +805,6 @@ mysql-multilib_pkg_config() {
cat ${help_tables} ${sqltmp}
fi
- einfo Creating the mysql database and setting proper
- einfo permissions on it ...
-
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists
before using it
- PID_DIR=${EROOT}/var/run/mysqld
- if [[ ! -d ${PID_DIR} ]]; then
- mkdir ${PID_DIR}
- chown mysql:mysql ${PID_DIR}
- chmod 755 ${PID_DIR}
- fi
-
local socket=${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock
local pidfile=${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid
local mysqld=${EROOT}/usr/sbin/mysqld \
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 15faf6c..5a7a6f7 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -764,7 +764,7 @@ mysql-v2_pkg_config() {
helpfile=${TMPDIR}/mysqld-help
${EROOT}/usr/sbin/mysqld --verbose --help ${helpfile} 2/dev/null
for opt in grant-tables host-cache name-resolve networking slave-start \
- federated innodb ssl log-bin relay-log slow-query-log
external-locking \
+ federated ssl log-bin relay-log slow-query-log external-locking
\
ndbcluster log-slave-updates \
; do
optexp=--(skip-)?${opt} optfull=--loose-skip-${opt}
@@ -780,11 +780,27 @@ mysql-v2_pkg_config() {
use prefix [[ -f ${MY_SYSCONFDIR}/my.cnf ]] \
options=${options}
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'
+ # MySQL 5.6+ needs InnoDB
+ if [[ ${PN} == mysql || ${PN} == percona-server ]] ; then
+ mysql_version_is_at_least 5.6 || options=${options}
--loose-skip-innodb
+ fi
+
+ einfo Creating the mysql database and setting proper
+ einfo permissions on it ...
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists
before using it
+ PID_DIR=${EROOT}/var/run/mysqld
+ if [[ ! -d ${PID_DIR} ]]; then
+ mkdir -p ${PID_DIR}
+ chown mysql:mysql ${PID_DIR}
+ chmod 755 ${PID_DIR}
+ fi
+
pushd ${TMPDIR} /dev/null
#cmd='${EROOT}/usr/share/mysql/scripts/mysql_install_db'
'--basedir=${EPREFIX}/usr' ${options}
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
+ cmd='$cmd' '--basedir=${EPREFIX}/usr' ${options}
'--datadir=${EROOT}/${MY_DATADIR}'
einfo Command: $cmd
eval $cmd
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/
commit: 5ba9c2e57596b377eaa4e5a2d965702c242d3b9d
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu May 1 16:01:10 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 1 16:01:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5ba9c2e5
[mariadb-galera] Version bump, 1 test fail: sys_vars.auto_increment_offset_func
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb-galera/Manifest | 3 ++-
.../{mariadb-galera-5.5.36.ebuild = mariadb-galera-5.5.37.ebuild} | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 79dc55c..236ee5d 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,5 +1,6 @@
DIST mariadb-galera-10.0.10.tar.gz 52124329 SHA256
f3120440a20d535798e08e2b4fd25f8bf05c7cc2d094c2bdf7384454354f4a96 SHA512
c99b3a9287b6b2ccacc6cfd9078bdc492f3c3e0a23963a07d2ff052ac3baf78e83283f73f771ce9d9ca32a600d440e3956005df047a332993b3c4942ce9e5e43
WHIRLPOOL
e52aac77da09cde10288345b3b8fbc7e3a13fc0e26e7d63774aed04b8a79b8e9a7c0f3f2c4f1e2dfcb37984d9086a281a67ee2f8bb299d2186734700a1cad397
DIST mariadb-galera-10.0.7.tar.gz 51553678 SHA256
93e334af054e053ba2f323a01bb8673e9661fa21e0c4a5467313f5722b274b31 SHA512
641bcf5572f425cb5a7e8a82ac25ec3e5faff726bd34d0ae913d6de8f6f2550ffbae29c927c705b32f0e46ac94587117cb28745e383be4b5dc815020fec7cfd2
WHIRLPOOL
3d96b87dbbcc8b1ef32a7581e09224f835fa9f73b73adc4639e6b01d451ae12570399456e1c4b0787b389d9db57460d931ba533a3eb0361af821c07a5b2f067a
DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256
ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512
78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09
WHIRLPOOL
fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
-DIST mariadb-galera-5.5.36.tar.gz 45903192 SHA256
3059bd8d047987bfd55eccf784e007314d43da6ef387a674d787e408c21dd1de SHA512
49d9f3f0f48271d688754b2787ee732736b24df54747257c82532b40917cb4d416b63b1b59ef5ccc80e342c82ff86b2e83460895a54f847be1b4cc9910f4
WHIRLPOOL
c20f959caf4b46beeeddc01a0e60fb4baf32438048e1e15eec47e8d04371f800fa8c5751b3b95a0ba9f13d1340577c8baee4e02c59af3936e061d93d791d0641
+DIST mariadb-galera-5.5.37.tar.gz 46241516 SHA256
3913849ffa754b55fedc4a9f625880dd8f25e4c5ce6e80594ac46a693494fae1 SHA512
e14dc38f2ca06d166af4a9752dac0fff2f56e674b7094704a169e7ddc1f34cff62fac3870d60743b02af45c7d8b55f7a9a981d55b8bc78269c9d88b02b4c34bc
WHIRLPOOL
39dd4e053ce815e9123aece722800a9fc0cf53ba8896eb1c702b17923499bf1fe8409ae10edfafcc813b65f6ba46e0d4dfcfa4159416ffa1d2a49c9ca4ae96e5
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
+DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
b/dev-db/mariadb-galera/mariadb-galera-5.5.37.ebuild
similarity index 99%
rename from dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-5.5.37.ebuild
index 973fd6b..7ed01f0 100644
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.36.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-5.5.37.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-MY_EXTRAS_VER=20140424-1043Z
+MY_EXTRAS_VER=20140426-0232Z
WSREP_REVISION=25
# Build system
[gentoo-commits] proj/mysql:master commit in: dev-java/mariadb-java-client/, dev-db/mariadb-native-client/, eclass/
commit: 65cc083a5f26d1490f05b12e168fbdd0c68609da
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Fri May 2 19:59:15 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Fri May 2 19:59:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=65cc083a
Update descriptions
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild | 2 +-
dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild | 2 +-
dev-db/mariadb-native-client/mariadb-native-client-.ebuild | 2 +-
dev-java/mariadb-java-client/mariadb-java-client-1.1.7.ebuild | 2 +-
dev-java/mariadb-java-client/mariadb-java-client-.ebuild| 2 +-
eclass/mysql-multilib.eclass| 2 +-
eclass/mysql-v2.eclass | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
index fb43970..54a2766 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild
@@ -14,7 +14,7 @@ fi
inherit cmake-multilib eutils ${VCS_INHERIT}
-DESCRIPTION=Client Library for C is used to connect applications developed in
C/C++ to MariaDB/MySQL databases
+DESCRIPTION=C client library for MariaDB/MySQL
HOMEPAGE=http://mariadb.org/;
SRC_URI=
http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
index 088c7ec..c689e17 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
@@ -19,7 +19,7 @@ MULTILIB_WRAPPED_HEADERS+=(
/usr/include/mariadb/my_config.h
)
-DESCRIPTION=Client Library for C is used to connect applications developed in
C/C++ to MariaDB/MySQL databases
+DESCRIPTION=C client library for MariaDB/MySQL
HOMEPAGE=http://mariadb.org/;
SRC_URI=
http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
diff --git a/dev-db/mariadb-native-client/mariadb-native-client-.ebuild
b/dev-db/mariadb-native-client/mariadb-native-client-.ebuild
index a0a135c..a7ab9ce 100644
--- a/dev-db/mariadb-native-client/mariadb-native-client-.ebuild
+++ b/dev-db/mariadb-native-client/mariadb-native-client-.ebuild
@@ -18,7 +18,7 @@ MULTILIB_WRAPPED_HEADERS+=(
/usr/include/mariadb/my_config.h
)
-DESCRIPTION=Client Library for C is used to connect applications developed in
C/C++ to MariaDB/MySQL databases
+DESCRIPTION=C client library for MariaDB/MySQL
HOMEPAGE=http://mariadb.org/;
SRC_URI=
http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-1.1.7.ebuild
b/dev-java/mariadb-java-client/mariadb-java-client-1.1.7.ebuild
index 72b6625..12eec18 100644
--- a/dev-java/mariadb-java-client/mariadb-java-client-1.1.7.ebuild
+++ b/dev-java/mariadb-java-client/mariadb-java-client-1.1.7.ebuild
@@ -22,7 +22,7 @@ JAVA_PKG_IUSE=doc
inherit java-pkg-2 java-ant-2 ${VCS_INHERIT}
-DESCRIPTION=Client Library for Java is used to connect applications to
MariaDB/MySQL databases
+DESCRIPTION=Java client library for MariaDB/MySQL
HOMEPAGE=http://mariadb.org/;
LICENSE=LGPL-2.1
diff --git a/dev-java/mariadb-java-client/mariadb-java-client-.ebuild
b/dev-java/mariadb-java-client/mariadb-java-client-.ebuild
index 995c821..59420ac 100644
--- a/dev-java/mariadb-java-client/mariadb-java-client-.ebuild
+++ b/dev-java/mariadb-java-client/mariadb-java-client-.ebuild
@@ -22,7 +22,7 @@ JAVA_PKG_IUSE=doc
inherit java-pkg-2 java-ant-2 eutils ${VCS_INHERIT}
-DESCRIPTION=Client Library for Java is used to connect applications to
MariaDB/MySQL databases
+DESCRIPTION=Java client library for MariaDB/MySQL
HOMEPAGE=http://mariadb.org/;
LICENSE=LGPL-2.1
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index d89e15a..cb5482c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -168,7 +168,7 @@ if [[ ${PN} == mariadb-galera ]]; then
fi
if [[ ${PN} == percona-server ]]; then
HOMEPAGE=http://www.percona.com/software/percona-server;
- DESCRIPTION=An enhanced, drop-in replacement fro MySQL from the
Percona team
+ DESCRIPTION=An enhanced, drop-in replacement for MySQL from the
Percona team
fi
LICENSE=GPL-2
SLOT=0
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 5a7a6f7..d4d1bd1 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -190,7 +190,7 @@ if [[ ${PN} == mariadb-galera ]]; then
fi
if [[ ${PN} == percona-server ]]; then
HOMEPAGE=http
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 19f09808ad93aa2941ed4aab515b66b8b4563e21
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Tue May 6 19:29:46 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue May 6 19:29:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=19f09808
Respon elib patch for percona 5.5.37
---
0_index.txt | 8 +-
20006_all_cmake_elib-percona-5.5.37.patch | 200 ++
2 files changed, 207 insertions(+), 1 deletion(-)
diff --git a/0_index.txt b/0_index.txt
index 45589ac..3111ac7 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1601,7 +1601,13 @@
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-percona-5.5.36.patch
-@ver 5.05.36.00 to 5.05.99.99
+@ver 5.05.36.00 to 5.05.36.99
+@pn percona-server
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-percona-5.5.37.patch
+@ver 5.05.37.00 to 5.05.99.99
@pn percona-server
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
diff --git a/20006_all_cmake_elib-percona-5.5.37.patch
b/20006_all_cmake_elib-percona-5.5.37.patch
new file mode 100644
index 000..557f932
--- /dev/null
+++ b/20006_all_cmake_elib-percona-5.5.37.patch
@@ -0,0 +1,200 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638
-0100
mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -43,7 +43,8 @@
+ # - INSTALL_SBINDIR (directory with mysqld)
+ # - INSTALL_SCRIPTDIR (several scripts, rarely used)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -117,6 +118,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include)
+@@ -148,9 +150,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -178,6 +182,7 @@
+ SET(INSTALL_SCRIPTDIR_DEB scripts)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include)
+@@ -204,6 +209,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include)
+@@ -234,7 +240,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
+@@ -40,6 +40,8 @@
+ # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 linklibN]
+ # [EXPORTS exported_func1 exported_func_N]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
++
+ # This macro merges several static libraries into a single one or creates a
shared
+ # library from several convenience libraries
+
+@@ -214,7 +216,7 @@
+ #)
+ MACRO(MERGE_LIBRARIES)
+ MYSQL_PARSE_ARGUMENTS(ARG
+-EXPORTS;OUTPUT_NAME;COMPONENT
++EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR
+ STATIC;SHARED;MODULE;NOINSTALL
+ ${ARGN}
+ )
+@@ -265,7 +267,11 @@
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ENDIF()
+-MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++IF(ARG_OUTPUT_DIR)
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${ARG_OUTPUT_DIR
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 7d93bfc0691a5cd825edd54876e6d6ad95222dd9 Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Tue May 6 19:37:28 2014 + Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Tue May 6 19:37:28 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=7d93bfc0 Small fix to last patch --- 20006_all_cmake_elib-percona-5.5.37.patch | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/20006_all_cmake_elib-percona-5.5.37.patch b/20006_all_cmake_elib-percona-5.5.37.patch index 557f932..5bc5d97 100644 --- a/20006_all_cmake_elib-percona-5.5.37.patch +++ b/20006_all_cmake_elib-percona-5.5.37.patch @@ -190,11 +190,11 @@ diff -aurN mysql.old/scripts/mysql_config.sh mysql/scripts/mysql_config.sh if [ -f $basedir/include/mysql/mysql.h ]; then pkgincludedir=$basedir/include/mysql @@ -113,7 +117,7 @@ - libs= $ldflags -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@ + libs= $ldflags @RPATH_OPTION@ -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@ libs=$libs @openssl_libs@ @STATIC_NSS_FLAGS@ - libs_r= $ldflags -L$pkglibdir -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ --embedded_libs= $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ -+embedded_libs= $ldflags -L$elibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ + libs_r= $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ +-embedded_libs= $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ ++embedded_libs= $ldflags -L$elibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ if [ -r $pkglibdir/libmygcc.a ]; then # When linking against the static library with a different version of GCC
[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/
commit: dd902de5bcdcadd14b958a46afc519a64c2ab36b
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 8 17:06:52 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 8 17:06:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=dd902de5
[percona-server] Version bumps
---
dev-db/percona-server/Manifest | 3 +-
2.ebuild = percona-server-5.5.37.35.0.ebuild} | 26 ++
2.ebuild = percona-server-5.6.17.65.0.ebuild} | 32 +++---
3 files changed, 15 insertions(+), 46 deletions(-)
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 35a6fac..e4d9668 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,3 +1,4 @@
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
-DIST percona-server-5.5.36-34.2.tar.gz 24206105 SHA256
62a0c4a45412e4c2eadf53d3a60977d33e27e650be32bf46bb13dff2b3e84fee SHA512
f6a072df53c85d170774e12d39e1b8d83db8d47daae370a915d9513e7c0224cd3afa64c84242aefbea98dd2e9f363bbe6bc454a3cfc1fbecdba274f550b724ae
WHIRLPOOL
d0bc8775a0618daa823f939339c875019b5c71400edf6401d4414d352e91d7a1963bc05bd4a81992cb915ae8ec6220df14dce066e11552575a496dfbe0721e88
+DIST percona-server-5.5.37-35.0.tar.gz 24261353 SHA256
8f6c61cc10b0dd4a75a19dcafcf2a945f3c4700184bbe06ac76c131c383b195c SHA512
4de50f4dae302ffa7e14916595cbe31eebd325943f3962e7e598aa73055d379cff996834ad421ec213fc4a7234275032e0726dd9f63536a243ae6f991b7e5c2f
WHIRLPOOL
05d5c551ef3876aed273847bdd50a8a8e66567551ef7e4b4699c385f5e12fef8ca41367d75bdbf78683d4de723b565eb9b80470bf93701e8fb5fa4bfa8d06c1e
DIST percona-server-5.6.16-64.2.tar.gz 34455024 SHA256
841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d SHA512
c114d4267f4c917bd886d76d4d6dca3c71bfc33efc57a8cbac623ec52b87b8cf1aaa6bdef3df6db91a074206d3c2206997c39d316abc33e927584307b791fb5c
WHIRLPOOL
ed60be8ec2008f9893df408b4e883ecf7c459d4e81a6e302207595980ac88ad5879f32d842ae9de66e5470b00db5b5b7a3fc5cb200468019f574d0e00df539de
+DIST percona-server-5.6.17-65.0.tar.gz 34602183 SHA256
e4246f6773330376e0548bc5d6d590e822e7be9d6fc8ceeece8f4feeafd2b9a3 SHA512
c184821c9715cb8127963e375513ec2473d2dff7f6fa7493aaacb1ea562a6cbba0e90797f1988cb44e3bca22566782efe3bd23608d416a3562a67b6fbc5e01ca
WHIRLPOOL
d4424b618ad697a98648f301df43e8ceae8b789837ae9388214b3ae4629eba2af27e307dfd8880c5c17f3a3cbf650300b397c8c354247cdee48135985a2e0f48
diff --git a/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
b/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
similarity index 79%
rename from dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
rename to dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
index a4421c6..6ef96b7 100644
--- a/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild
+++ b/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-MY_EXTRAS_VER=20140424-1043Z
+MY_EXTRAS_VER=live
MY_PV=${PV//_alpha_pre/-m}
MY_PV=${MY_PV//_/-}
@@ -67,7 +67,7 @@ src_test() {
# 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
+ # These are failing in Perocna 5.5 for now and are believed to
be
# false positives:
#
# main.information_schema,
binlog.binlog_statement_insert_delayed,
@@ -77,33 +77,13 @@ src_test() {
# 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'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL
connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL
connection
- # error: error:0001:lib(0):func(0):reason(1)
- #
- # main.file_contents
- # Fails finding a BZR revision number from a text file.
- # This is an information only test and not needed in Gentoo
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: f1f205c2997d8ada03040c128a59c4c71ab63ea5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 8 17:09:24 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 8 17:09:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1f205c2
[eclass] Add my dev space as a patch source
---
eclass/mysql-multilib.eclass | 1 +
eclass/mysql-v2.eclass | 1 +
2 files changed, 2 insertions(+)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index cb5482c..5b46f66 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -154,6 +154,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index d4d1bd1..7fb7bfa 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -176,6 +176,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: b59f3b7b65ef303b96037e46d48a47e107e87dd2
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu May 8 17:19:57 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu May 8 17:19:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b59f3b7b
[eclass] Add my dev space as a patch source (take 2)
---
eclass/mysql-multilib.eclass | 2 +-
eclass/mysql-v2.eclass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5b46f66..a0cb75b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -153,7 +153,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
SRC_URI=${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 7fb7bfa..f66c2ab 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -175,7 +175,7 @@ if [[ ${MY_EXTRAS_VER} != live ${MY_EXTRAS_VER} !=
none ]]; then
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
+
http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2;
fi
[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20140509-0130Z
commit: Commit: Brian Evans grknight AT lavabit DOT com CommitDate: Fri May 09 01:55:41 2014 + New tag: mysql-extras-20140509-0130Z
[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/
commit: a5c8353c4011813c7f1bc2b96da999ba0647e1c9
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat May 10 01:39:16 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sat May 10 01:39:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a5c8353c
[percona-server] Add extras tarball
---
dev-db/percona-server/Manifest | 2 +-
dev-db/percona-server/percona-server-5.5.37.35.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index e4d9668..027c2a7 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,4 +1,4 @@
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
+DIST mysql-extras-20140509-0130Z.tar.bz2 1493031 SHA256
e7b1b0f7556c3230e7ce7c971c4562de0e5ea706301cc107b4d23136207e33fa SHA512
0f7409a48b64030c492e9600112e54a0e01b440b450b15dc2137b72971883f53bc27c3ddf591c29784c7c62673d40c37ebe6a86a21b29a64f67d82804573f009
WHIRLPOOL
6d2301aeb4a2cc53bec922f058ee58f68aaa0a4075ffdce03d5c6f249b90c7901949d3d2598c02e8287ceb6c02e3dccc673886eeaedee900882e55880e5577c3
DIST percona-server-5.5.37-35.0.tar.gz 24261353 SHA256
8f6c61cc10b0dd4a75a19dcafcf2a945f3c4700184bbe06ac76c131c383b195c SHA512
4de50f4dae302ffa7e14916595cbe31eebd325943f3962e7e598aa73055d379cff996834ad421ec213fc4a7234275032e0726dd9f63536a243ae6f991b7e5c2f
WHIRLPOOL
05d5c551ef3876aed273847bdd50a8a8e66567551ef7e4b4699c385f5e12fef8ca41367d75bdbf78683d4de723b565eb9b80470bf93701e8fb5fa4bfa8d06c1e
-DIST percona-server-5.6.16-64.2.tar.gz 34455024 SHA256
841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d SHA512
c114d4267f4c917bd886d76d4d6dca3c71bfc33efc57a8cbac623ec52b87b8cf1aaa6bdef3df6db91a074206d3c2206997c39d316abc33e927584307b791fb5c
WHIRLPOOL
ed60be8ec2008f9893df408b4e883ecf7c459d4e81a6e302207595980ac88ad5879f32d842ae9de66e5470b00db5b5b7a3fc5cb200468019f574d0e00df539de
DIST percona-server-5.6.17-65.0.tar.gz 34602183 SHA256
e4246f6773330376e0548bc5d6d590e822e7be9d6fc8ceeece8f4feeafd2b9a3 SHA512
c184821c9715cb8127963e375513ec2473d2dff7f6fa7493aaacb1ea562a6cbba0e90797f1988cb44e3bca22566782efe3bd23608d416a3562a67b6fbc5e01ca
WHIRLPOOL
d4424b618ad697a98648f301df43e8ceae8b789837ae9388214b3ae4629eba2af27e307dfd8880c5c17f3a3cbf650300b397c8c354247cdee48135985a2e0f48
diff --git a/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
b/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
index 6ef96b7..a991593 100644
--- a/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.5.37.35.0.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-MY_EXTRAS_VER=live
+MY_EXTRAS_VER=20140509-0130Z
MY_PV=${PV//_alpha_pre/-m}
MY_PV=${MY_PV//_/-}
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 840585ed77b204d9731ec2259ccef4a32c63ca28
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Mon May 12 18:15:28 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon May 12 18:15:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=840585ed
Respin patch for mariadb 10.0.11
---
0_index.txt| 8 +-
20006_all_cmake_elib-mariadb-10.0.11.patch | 187 +
2 files changed, 194 insertions(+), 1 deletion(-)
diff --git a/0_index.txt b/0_index.txt
index 3111ac7..4a1d471 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1625,7 +1625,13 @@
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-mariadb-10.0.7.patch
-@ver 10.00.07.00 to 10.00.99.99
+@ver 10.00.07.00 to 10.10.99.99
+@pn mariadb
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-mariadb-10.0.11.patch
+@ver 10.00.11.00 to 10.10.99.99
@pn mariadb
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
diff --git a/20006_all_cmake_elib-mariadb-10.0.11.patch
b/20006_all_cmake_elib-mariadb-10.0.11.patch
new file mode 100644
index 000..5281bf5
--- /dev/null
+++ b/20006_all_cmake_elib-mariadb-10.0.11.patch
@@ -0,0 +1,187 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470
-0100
mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100
+@@ -44,7 +44,8 @@
+ # - INSTALL_SYSCONFDIR(my.cnf config file. Usually /etc or
nothing)
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -120,6 +121,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include/mysql)
+@@ -150,9 +152,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -183,6 +187,7 @@
+ SET(INSTALL_SYSCONF2DIR_DEB /etc/mysql/conf.d)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include/mysql)
+@@ -210,6 +215,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include/mysql)
+@@ -241,7 +247,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST
UNIX_ADDR)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100
mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100
+@@ -211,10 +211,11 @@
+ # [linklib1 linklibN]
+ # [EXPORTS exported_func1 exportedFuncN]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
+ #)
+ MACRO(MERGE_LIBRARIES)
+ MYSQL_PARSE_ARGUMENTS(ARG
+-EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION
++EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR
+ STATIC;SHARED;MODULE;NOINSTALL
+ ${ARGN}
+ )
+@@ -274,7 +275,11 @@
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ENDIF()
+-MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++IF(ARG_OUTPUT_DIR)
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${ARG_OUTPUT_DIR} ${COMP})
++ELSE()
++ MYSQL_INSTALL_TARGETS(${TARGET
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: faf8cf71d0d81778587948f1dfac99700ace0291
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue May 13 01:31:09 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue May 13 01:31:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=faf8cf71
[mariadb] Version bump, binlog.binlog_old_versions test failed
---
dev-db/mariadb/Manifest | 3 +--
dev-db/mariadb/{mariadb-10.0.10.ebuild = mariadb-10.0.11.ebuild} | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2068db1..a5f91d1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,9 +1,8 @@
DIST mariadb-10.0.10.tar.gz 51946792 SHA256
66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512
806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948
WHIRLPOOL
79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
-DIST mariadb-10.0.9.tar.gz 51614120 SHA256
301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512
2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064
WHIRLPOOL
0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
+DIST mariadb-10.0.11.tar.gz 51084235 SHA256
631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512
0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6
WHIRLPOOL
194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.37.tar.gz 46078042 SHA256
a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512
aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1
WHIRLPOOL
2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256
84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512
a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc
WHIRLPOOL
241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild
b/dev-db/mariadb/mariadb-10.0.11.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.0.10.ebuild
rename to dev-db/mariadb/mariadb-10.0.11.ebuild
index 108d8bf..33c48c8 100644
--- a/dev-db/mariadb/mariadb-10.0.10.ebuild
+++ b/dev-db/mariadb
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 00600cbb6bc9432096f3da053748bc752804d4aa
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue May 13 03:14:10 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Tue May 13 03:14:10 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00600cbb
[eclass] Restrict bison version for =5.5 builds
---
eclass/mysql-v2.eclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f66c2ab..cd0db68 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -341,6 +341,9 @@ DEPEND=${DEPEND}
virtual/yacc
+# Only 5.5+ has been made compatible with Bison 3+
+mysql_version_is_at_least 5.5 || DEPEND=${DEPEND} !sys-devel/bison-3.0
+
DEPEND=${DEPEND} static? ( sys-libs/ncurses[static-libs] )
# compile-time-only
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: b4e23e00dc25af07778b67472f32300f5801f814
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Sun Apr 6 11:47:22 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Sun Apr 6 11:47:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4e23e00
[eclass] Add libpcre-8.35 dep for mariadb 10
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-cmake.eclass| 3 +--
eclass/mysql-multilib.eclass | 9 -
eclass/mysql-v2.eclass | 9 -
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 96f89b8..81159ac 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -332,8 +332,7 @@ mysql-cmake_src_configure() {
else
mycmakeargs+=( -DWITH_JEMALLOC=no )
fi
- # TODO: uncomment this when libpcre 8.35 is released to remove bundled
library
-# mysql_version_is_at_least 10.0.9 mycmakeargs+=(
-DWITH_PCRE=system )
+ mysql_version_is_at_least 10.0.9 mycmakeargs+=(
-DWITH_PCRE=system )
fi
configure_cmake_locale
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7814b2d..7eb14bf 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -239,11 +239,10 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]
; then
fi
mysql_version_is_at_least 10.0.7 DEPEND=${DEPEND} oqgraph? (
dev-libs/judy:0= )
- # TODO: uncomment this when libpcre 8.35 is released to remove bundled
library
-# if mysql_version_is_at_least 10.0.9 ; then
-# use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35:3=[static-libs?] || \
-# DEPEND=${DEPEND} =dev-libs/libpcre-8.35:3=
-# fi
+ if mysql_version_is_at_least 10.0.9 ; then
+ use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35:3=[static-libs] || \
+ DEPEND=${DEPEND} =dev-libs/libpcre-8.35:3=
+ fi
fi
# Having different flavours at the same time is not a good idea
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3a04875..67f9499 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -272,11 +272,10 @@ if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]
; then
fi
mysql_version_is_at_least 10.0.7 DEPEND=${DEPEND} oqgraph? (
dev-libs/judy )
- # TODO: uncomment this when libpcre 8.35 is released to remove bundled
library
-# if mysql_version_is_at_least 10.0.9 ; then
-# use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35[static-libs?] || \
-# DEPEND=${DEPEND} =dev-libs/libpcre-8.35
-# fi
+ if mysql_version_is_at_least 10.0.9 ; then
+ use embedded DEPEND=${DEPEND}
=dev-libs/libpcre-8.35[static-libs] || \
+ DEPEND=${DEPEND} =dev-libs/libpcre-8.35
+ fi
fi
# Having different flavours at the same time is not a good idea
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: ca6691d526b69992959fdcc342acc684a5003ae2
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu Apr 10 15:27:58 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Apr 10 15:27:58 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=ca6691d5
Backport tzinfo fix from MariaDB. Bug 491176
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
0_index.txt | 6 ++
20008_all_mysql-tzinfo-symlink.patch | 103 +++
2 files changed, 109 insertions(+)
diff --git a/0_index.txt b/0_index.txt
index 94ed5c3..17cac9f 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1635,3 +1635,9 @@
@pn mysql
@pn percona-server
@@ Remove -Werror from USE=debug builds
+
+@patch 20008_all_mysql-tzinfo-symlink.patch
+@ver 5.05.36.00 to 5.99.99.99
+@pn mysql
+@pn percona-server
+@@ Backport tzinfo symlink fix from MariaDB bug 491176
diff --git a/20008_all_mysql-tzinfo-symlink.patch
b/20008_all_mysql-tzinfo-symlink.patch
new file mode 100644
index 000..5b7a524
--- /dev/null
+++ b/20008_all_mysql-tzinfo-symlink.patch
@@ -0,0 +1,103 @@
+=== modified file 'sql/tztime.cc'
+--- sql/tztime.cc 2013-05-07 11:05:09 +
sql/tztime.cc 2013-11-13 15:16:35 +
+@@ -2494,7 +2494,7 @@
+
+ */
+ my_bool
+-scan_tz_dir(char * name_end)
++scan_tz_dir(char * name_end, uint symlink_recursion_level)
+ {
+ MY_DIR *cur_dir;
+ char *name_end_tmp;
+@@ -2514,7 +2514,32 @@
+
+ if (MY_S_ISDIR(cur_dir-dir_entry[i].mystat-st_mode))
+ {
+-if (scan_tz_dir(name_end_tmp))
++my_bool is_symlink;
++if ((is_symlink= my_is_symlink(fullname))
++symlink_recursion_level 0)
++{
++ /*
++The timezone definition data in some Linux distributions
++ (e.g. the timezone-data-2013f package in Gentoo)
++may have synlimks like:
++ /usr/share/zoneinfo/posix/ - /usr/share/zoneinfo/,
++so the same timezone files are available under two names
++(e.g. CET and posix/CET).
++
++We allow one level of symlink recursion for backward
++compatibility with earlier timezone data packages that have
++duplicate copies of the same timezone files inside the root
++directory and the posix subdirectory (instead of symlinking).
++This makes posix/CET still available, but helps to avoid
++following such symlinks infinitely:
++ /usr/share/zoneinfo/posix/posix/posix/.../posix/
++ */
++ fflush(stdout);
++ fprintf(stderr, Warning: Skipping directory '%s':
++ to avoid infinite symlink recursion.\n, fullname);
++ continue;
++}
++if (scan_tz_dir(name_end_tmp, symlink_recursion_level + is_symlink))
+ {
+ my_dirend(cur_dir);
+ return 1;
+@@ -2526,14 +2551,20 @@
+ if (!tz_load(fullname, tz_info, tz_storage))
+ print_tz_as_sql(root_name_end + 1, tz_info);
+ else
++{
++ fflush(stdout);
+ fprintf(stderr,
+ Warning: Unable to load '%s' as time zone. Skipping it.\n,
+ fullname);
++}
+ free_root(tz_storage, MYF(0));
+ }
+ else
++ {
++fflush(stdout);
+ fprintf(stderr, Warning: '%s' is not regular file or directory\n,
+ fullname);
++ }
+ }
+ }
+
+@@ -2566,8 +2597,9 @@
+ printf(TRUNCATE TABLE time_zone_transition;\n);
+ printf(TRUNCATE TABLE time_zone_transition_type;\n);
+
+-if (scan_tz_dir(root_name_end))
++if (scan_tz_dir(root_name_end, 0))
+ {
++ fflush(stdout);
+ fprintf(stderr, There were fatal errors during processing
+ of zoneinfo directory\n);
+ return 1;
+@@ -2586,6 +2618,7 @@
+ {
+ if (tz_load(argv[2], tz_info, tz_storage))
+ {
++fflush(stdout);
+ fprintf(stderr, Problems with zoneinfo file '%s'\n, argv[2]);
+ return 1;
+ }
+@@ -2595,6 +2628,7 @@
+ {
+ if (tz_load(argv[1], tz_info, tz_storage))
+ {
++fflush(stdout);
+ fprintf(stderr, Problems with zoneinfo file '%s'\n, argv[2]);
+ return 1;
+ }
+@@ -2604,6 +2638,7 @@
+ free_root(tz_storage, MYF(0));
+ }
+
++ my_end(0);
+ return 0;
+ }
+
+
[gentoo-commits] proj/mysql:master commit in: eclass/
commit: 1785d7937ecdea46f5791849d3d455d480099dee
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Mon Apr 14 18:54:19 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Mon Apr 14 18:54:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1785d793
Add CFLAGS option to mysql-multilib.eclass
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
eclass/mysql-multilib.eclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7eb14bf..e2dd614 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -393,7 +393,10 @@ mysql-multilib_src_configure() {
CMAKE_BUILD_TYPE=RelWithDebInfo
+ # debug hack wrt #497532
mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug
-DNDEBUG)
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug
-DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-DSYSCONFDIR=${EPREFIX}/etc/mysql
[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
commit: 054502f532301255028c15eb0622b235ad624379
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Thu Apr 17 17:23:07 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Thu Apr 17 17:23:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=054502f5
[mariadb] Version bump
Signed-off-by: Brian Evans grknight AT tuffmail.com
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/{mariadb-5.5.36.ebuild = mariadb-5.5.37.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 56b9e34..8c16e7c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,5 +3,5 @@ DIST mariadb-10.0.9.tar.gz 51614120 SHA256
301320ade949a80f16a83b140a068278d234b
DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
WHIRLPOOL
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
-DIST mariadb-5.5.36.tar.gz 45767693 SHA256
16f2cc9c219b4fbe0b3e97f14d1ed6fd8b7d377b22b95f31adae91965e36bb0c SHA512
b7de14f4d4a08f51aae339779c59798f3ed110aa3d65038c39514161ee73b6cc95f95fe1b15434daf33de689b0d7351cbf7a1c90ca980f0f020b085ef23aa016
WHIRLPOOL
439e10efedf90f0a66e2e166728ade1e7112049802ac76fc83a5dd64a62daadbad1eb91d437f71ab36b5e2a6f5a0911cd6625b9b726c831057b44b38bf482593
+DIST mariadb-5.5.37.tar.gz 46078042 SHA256
a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512
aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1
WHIRLPOOL
2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-5.5.36.ebuild
b/dev-db/mariadb/mariadb-5.5.37.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.36.ebuild
rename to dev-db/mariadb/mariadb-5.5.37.ebuild
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: e8739c87d7879529c68b0902ff6859d4806e92e5
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Oct 9 14:47:09 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Oct 9 14:47:09 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=e8739c87
Add new patch for mariadb 5.5.40
---
0_index.txt | 8 +-
20006_all_cmake_elib-mariadb-5.5.40.patch | 202 ++
2 files changed, 209 insertions(+), 1 deletion(-)
diff --git a/0_index.txt b/0_index.txt
index 269a589..b82c694 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -1590,7 +1590,13 @@
@@ Also install static libs by ENABLE_STATIC_LIBS
@patch 20006_all_cmake_elib-mariadb-5.5.33.patch
-@ver 5.05.33.00 to 5.05.99.99
+@ver 5.05.33.00 to 5.05.39.99
+@pn mariadb
+@@ Add ELIBPATH to split client and embedded libs
+@@ Also install static libs by ENABLE_STATIC_LIBS
+
+@patch 20006_all_cmake_elib-mariadb-5.5.40.patch
+@ver 5.05.40.00 to 5.05.99.99
@pn mariadb
@@ Add ELIBPATH to split client and embedded libs
@@ Also install static libs by ENABLE_STATIC_LIBS
diff --git a/20006_all_cmake_elib-mariadb-5.5.40.patch
b/20006_all_cmake_elib-mariadb-5.5.40.patch
new file mode 100644
index 000..7109578
--- /dev/null
+++ b/20006_all_cmake_elib-mariadb-5.5.40.patch
@@ -0,0 +1,202 @@
+diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
+--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470
-0100
mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100
+@@ -44,7 +44,8 @@
+ # - INSTALL_SYSCONFDIR(my.cnf config file. Usually /etc or
nothing)
+ # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d)
+ #
+-# - INSTALL_LIBDIR (directory with client end embedded libraries)
++# - INSTALL_LIBDIR (directory with client libraries)
++# - INSTALL_ELIBDIR (directory with embedded libraries)
+ # - INSTALL_PLUGINDIR (directory for plugins)
+ #
+ # - INSTALL_INCLUDEDIR (directory for MySQL headers)
+@@ -120,6 +121,7 @@
+ SET(INSTALL_SCRIPTDIR_STANDALONEscripts)
+ #
+ SET(INSTALL_LIBDIR_STANDALONE lib)
++SET(INSTALL_ELIBDIR_STANDALONE lib)
+ SET(INSTALL_PLUGINDIR_STANDALONElib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_STANDALONE include/mysql)
+@@ -150,9 +152,11 @@
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
+ SET(INSTALL_LIBDIR_RPMlib64)
++ SET(INSTALL_ELIBDIR_RPM lib64)
+ SET(INSTALL_PLUGINDIR_RPM lib64/mysql/plugin)
+ ELSE()
+ SET(INSTALL_LIBDIR_RPMlib)
++ SET(INSTALL_ELIBDIR_RPM lib)
+ SET(INSTALL_PLUGINDIR_RPM lib/mysql/plugin)
+ ENDIF()
+ #
+@@ -183,6 +187,7 @@
+ SET(INSTALL_SYSCONF2DIR_DEB /etc/mysql/conf.d)
+ #
+ SET(INSTALL_LIBDIR_DEB lib)
++SET(INSTALL_ELIBDIR_DEB lib)
+ SET(INSTALL_PLUGINDIR_DEB lib/mysql/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_DEB include/mysql)
+@@ -210,6 +215,7 @@
+ SET(INSTALL_SCRIPTDIR_SVR4 scripts)
+ #
+ SET(INSTALL_LIBDIR_SVR4 lib)
++SET(INSTALL_ELIBDIR_SVR4lib)
+ SET(INSTALL_PLUGINDIR_SVR4 lib/plugin)
+ #
+ SET(INSTALL_INCLUDEDIR_SVR4 include/mysql)
+@@ -241,7 +247,7 @@
+ # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
+ # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
+ # layout is chosen)
+-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
SYSCONF SYSCONF2
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR)
+ SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
+ CACHE STRING ${var} installation directory ${FORCE})
+diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
+--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100
mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100
+@@ -211,10 +211,11 @@
+ # [linklib1 linklibN]
+ # [EXPORTS exported_func1 exportedFuncN]
+ # [OUTPUT_NAME output_name]
++# [OUTPUT_DIR output_dir]
+ #)
+ MACRO(MERGE_LIBRARIES)
+ MYSQL_PARSE_ARGUMENTS(ARG
+-EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION
++EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR
+ STATIC;SHARED;MODULE;NOINSTALL
+ ${ARGN}
+ )
+@@ -274,7 +275,11 @@
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ENDIF()
+-MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR} ${COMP})
++IF(ARG_OUTPUT_DIR)
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${ARG_OUTPUT_DIR} ${COMP})
++ELSE()
++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION ${INSTALL_LIBDIR
[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20141009-1450Z
commit: Commit: Brian Evans grknight AT gentoo DOT org CommitDate: Thu Oct 09 14:51:00 2014 + New tag: mysql-extras-20141009-1450Z
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: a67fbb36cf3d44a90396f49a1db5fde57bd968fb Author: Brian Evans grknight AT gentoo DOT org AuthorDate: Fri Oct 17 14:19:37 2014 + Commit: Brian Evans grknight AT gentoo DOT org CommitDate: Fri Oct 17 14:19:37 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=a67fbb36 Fix header include error for bug 525644 wrt MDEV-6862 --- 0_index.txt | 7 +++ 20012_all_mariadb-debug-header.patch | 12 2 files changed, 19 insertions(+) diff --git a/0_index.txt b/0_index.txt index b82c694..610392e 100644 --- a/0_index.txt +++ b/0_index.txt @@ -1734,3 +1734,10 @@ @pn mariadb-galera @@ Fix bad comparision of void to ulong @@ Gentoo bug 520092 MDEV-6595 + +@patch 20012_all_mariadb-debug-header.patch +@ver 5.05.40.00 to 5.05.40.99 +@pn mariadb +@pn mariadb-galera +@@ Fix bad header #error which breaks other builds +@@ Gentoo bug 525644 MDEV-6862 diff --git a/20012_all_mariadb-debug-header.patch b/20012_all_mariadb-debug-header.patch new file mode 100644 index 000..2791a9b --- /dev/null +++ b/20012_all_mariadb-debug-header.patch @@ -0,0 +1,12 @@ +diff -aurN mysql.orig/config.h.cmake mysql/config.h.cmake +--- mysql.orig/config.h.cmake 2014-10-08 09:19:51.0 -0400 mysql/config.h.cmake 2014-10-17 09:51:33.617709631 -0400 +@@ -650,7 +650,7 @@ + + __GLIBC__ is defined in features.h + */ +-#ifdef __GLIBC__ ++#if 0 + #error my_config.h MUST be included first! + #endif +
[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20141017-1419Z
commit: Commit: Brian Evans grknight AT gentoo DOT org CommitDate: Fri Oct 17 14:20:09 2014 + New tag: mysql-extras-20141017-1419Z
[gentoo-commits] proj/mysql-extras:master commit in: /
commit: 41e22794bda04788b5d39e2b8e1f13603523e2ad
Author: Brian Evans grknight AT tuffmail DOT com
AuthorDate: Sat Oct 18 00:13:45 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Oct 18 00:13:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=41e22794
Respin mysql_config cleanup for 5.6
---
0_index.txt | 6
01050_all_mysql_config_cleanup-5.6.patch | 58
2 files changed, 64 insertions(+)
diff --git a/0_index.txt b/0_index.txt
index 610392e..0027586 100644
--- a/0_index.txt
+++ b/0_index.txt
@@ -251,6 +251,12 @@
@pn mysql
@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
+@patch 01050_all_mysql_config_cleanup-5.6.patch
+@ver 5.06.00.00 to 5.06.99.99
+@pn mysql
+@pn percona-server
+@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
+
@patch 02000_all_query-logging-bypass-4.1.19.patch
@ver 4.01.14.00 to 4.01.99.99
@pn mysql
diff --git a/01050_all_mysql_config_cleanup-5.6.patch
b/01050_all_mysql_config_cleanup-5.6.patch
new file mode 100644
index 000..183f164
--- /dev/null
+++ b/01050_all_mysql_config_cleanup-5.6.patch
@@ -0,0 +1,58 @@
+diff -aurN mysql.orig/scripts/mysql_config.sh mysql/scripts/mysql_config.sh
+--- mysql.orig/scripts/mysql_config.sh 2014-10-17 19:37:06.511549907 -0400
mysql/scripts/mysql_config.sh 2014-10-17 19:53:44.458132867 -0400
+@@ -125,22 +125,42 @@
+ cxxflags=-I$pkgincludedir @CXXFLAGS@ #note: end space!
+ include=-I$pkgincludedir
+
+-# Remove some options that a client doesn't have to care about
+-for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \
+- DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
+- 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*'
'march=[-A-Za-z0-9]*' \
+- unroll2 ip mp restrict
++tmpcflags=
++for f in $cflags
+ do
+- # The first option we might strip will always have a space before it because
+- # we set -I$pkgincludedir as the first option
+- cflags=`echo $cflags|sed -e s/ -$remove */ /g`
+- cxxflags=`echo $cxxflags|sed -e s/ -$remove */ /g`
++ case ${f} in
++-DDBUG_OFF) f= ;;
++-DSAFE_MUTEX) f= ;;
++-DUNIV_MUST_NOT_INLINE) f= ;;
++-DFORCE_INIT_OF_VARS) f= ;;
++-DEXTRA_DEBUG) f= ;;
++-DHAVE_purify) f= ;;
++-[ID]*) tmpcflags=${tmpcflags} ${f} ;;
++-[Ll]*)
++ libs=${libs} ${f}
++ libs_r=${libs_r} ${f}
++ embedded_libs=${embedded_libs} ${f}
++;;
++ esac
+ done
+-cflags=`echo $cflags|sed -e 's/ *\$//'`
+-cxxflags=`echo $cxxflags|sed -e 's/ *\$//'`
++cflags=${tmpcflags# }
++tmpcxxflags=
++for f in $cxxflags
++do
++ case ${f} in
++-DDBUG_OFF) f= ;;
++-DSAFE_MUTEX) f= ;;
++-DUNIV_MUST_NOT_INLINE) f= ;;
++-DFORCE_INIT_OF_VARS) f= ;;
++-DEXTRA_DEBUG) f= ;;
++-DHAVE_purify) f= ;;
++-[ID]*) tmpcxxflags=${tmpcxxflags} ${f} ;;
++ esac
++done
++cxxflags=${tmpcxxflags# }
+
+ # Same for --libs(_r)
+-for remove in lmtmalloc static-libcxa i-static static-intel
++for remove in lmtmalloc static-libcxa i-static static-intel lprobes_mysql
+ do
+ # We know the strings starts with a space
+ libs=`echo $libs|sed -e s/ -$remove */ /g`
