commit: b7a8e3978f66bb2fa4d208476f541796ca49013f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 21:42:37 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 21:42:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b7a8e397
Changes to the new mysql-multilib-r1 eclass and associated ebuilds
dev-db/mariadb-connector-c/Manifest | 22 ++++
dev-db/mariadb/mariadb-10.1.9-r1.ebuild | 14 +--
dev-db/mysql/Manifest | 3 +-
.../mysql-5.6.28.ebuild} | 130 ++++++++++-----------
.../percona-server-5.6.26.74.0-r1.ebuild | 10 +-
eclass/mysql-multilib-r1.eclass | 27 ++---
6 files changed, 110 insertions(+), 96 deletions(-)
diff --git a/dev-db/mariadb-connector-c/Manifest
b/dev-db/mariadb-connector-c/Manifest
index b94a3e6..f2d8d4d 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256
568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512
1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7
WHIRLPOOL
205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624
DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512
7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75
WHIRLPOOL
be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVz8uUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2a6YP/31jEv+FjVwcuXO5twJo/GDD
+TvolosUT979zeD8/VHlrLykAsDJIIqUlVPeHA9bdJ+FvksFvKqi5bZmHJiKcc93z
+Spvu/z0s8T1BRez5GK3R0iljabebGKkpIg+s3CfFrOlXtyuco+7m/vG+GfAvaqZP
+61yMWVc8Exj0BtiQCSMFaCLeueVcyW3Np7dvp+jPXG4A+pILLJigq/mOp8Gf+aSb
+8WZbhqaXipuYc5IONjEdyROabKBfp2PsuU/I+TNPo1aF5mgfQ6YUBok2h5A8+i1R
+jOvUMP45kt7AannwTrnPU8l0KbGhvwBhI2HF30BggPDEjFTlLitv/xaDUJUEaYpm
+d24PtCP3fPOetEX9v5K+dIde/XeGdhmLA02yyh2oH9Ryvmkawu/+n7UHR5YVS3/F
+N0lBgK1QlpoWlI3mhlyh/vh7dbzQxsJSISNUipS79HIot4JNgxoneawOZDbGXhnO
+xxReUHb8AkN8hY1TnaUquXNBtZ5BQpqQkcLEoeZMZEIZ9FX4mvd8ZldmEYhGQmTP
+UkEATZiKn8PhVMkAOiaUONpIX38D+EzfUBfxnOEem0TF0P8rgDsjEfzkOAuWmrun
+F8WIBNwPpcZjVm2y7h8lwCTJUl0o2qkMkk+Acw/1y8eOUlO+fW3LMGu7xBrFmoP+
+f5w97K+BgCuRL7ulssrQ
+=48nq
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
index 7ec76dd..6fbdc74 100644
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
@@ -66,19 +66,19 @@ MULTILIB_WRAPPED_HEADERS+=(
/usr/include/mysql/mysql_version.h )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES="
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
-DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
- "
+ )
if use server ; then
# Federated{,X} must be treated special otherwise they will not
be built as plugins
if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+="
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
-DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO"
+ -DPLUGIN_FEDERATEDX=NO )
fi
- MYSQL_CMAKE_NATIVE_DEFINES+="
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
@@ -95,9 +95,9 @@ src_configure(){
-DWITH_INNODB_LZ4=$(usex innodb-lz4)
-DWITH_INNODB_LZO=$(usex innodb-lzo)
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- "
+ )
- use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+="-DWITHOUT_MROONGA=1"
+ use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=(
-DWITHOUT_MROONGA=1 )
fi
mysql-multilib-r1_src_configure
}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4b58fed..ca2d123 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,14 +4,15 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde1539575
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.46.tar.gz 21838374 SHA256
93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512
c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27
WHIRLPOOL
355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
DIST mysql-5.6.27.tar.gz 33327156 SHA256
8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512
2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09
WHIRLPOOL
4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
+DIST mysql-5.6.28.tar.gz 32182980 SHA256
217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512
f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc
WHIRLPOOL
039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256
1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512
443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c
WHIRLPOOL
29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256
9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512
97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b
WHIRLPOOL
e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
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
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
+DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256
74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512
886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35
WHIRLPOOL
9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256
e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512
e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c
WHIRLPOOL
f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
WHIRLPOOL
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256
18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512
555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308
WHIRLPOOL
56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034
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
diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
b/dev-db/mysql/mysql-5.6.28.ebuild
similarity index 55%
copy from dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
copy to dev-db/mysql/mysql-5.6.28.ebuild
index 4df5953..c41c878 100644
--- a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.28.ebuild
@@ -3,56 +3,46 @@
# $Id$
EAPI="5"
+
MY_EXTRAS_VER="20150717-1707Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+HAS_TOOLS_PATCH="1"
SUBSLOT="18"
-PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs python-any-r1 mysql-multilib-r1
-IUSE="pam tokudb tokudb-backup-plugin"
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x86-linux"
-HOMEPAGE="http://www.percona.com/software/percona-server";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
-COMMON_DEPEND="server? ( pam? ( virtual/pam:0= ) )
- tokudb? ( app-arch/snappy )
- tokudb-backup-plugin? ( dev-util/valgrind )
- "
-
-DEPEND="${COMMON_DEPEND}
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- test? ( $(python_gen_any_dep
'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+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
-python_check_deps() {
- has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
-}
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-src_configure() {
- local MYSQL_CMAKE_NATIVE_DEFINES="-DWITH_PAM=$(usex pam)"
- if use tokudb ; then
- # TokuDB Backup plugin requires valgrind unconditionally
- MYSQL_CMAKE_NATIVE_DEFINES+="
- $(mysql-cmake_use_plugin tokudb TOKUDB)
- $(usex tokudb-backup-plugin ''
-DTOKUDB_BACKUP_DISABLED=1)
- "
+src_prepare() {
+ mysql-multilib-r1_src_prepare
+ if use libressl ; then
+ sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+ "${S}/cmake/ssl.cmake" || die
fi
}
# Official test instructions:
-# USE='extraengine perl openssl static-libs' \
+# USE='server embedded extraengine perl openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
+# ebuild mysql-X.X.XX.ebuild \
# digest clean package
multilib_src_test() {
@@ -61,7 +51,7 @@ multilib_src_test() {
return 0;
fi
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -84,6 +74,13 @@ multilib_src_test() {
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+ # Create a symlink to provided binaries so the tests can find
them when client-libs is off
+ if ! use client-libs ; then
+ ln -srf /usr/bin/my_print_defaults
"${BUILD_DIR}/client/my_print_defaults" || die
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" ||
die
+ mysql-multilib_disable_test main.perror "String
mismatch due to not building local perror"
+ fi
+
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# Enable parallel testing, auto will try to detect number of
cores
@@ -94,60 +91,64 @@ multilib_src_test() {
# create directories because mysqladmin might right out of order
mkdir -p "${T}"/var-tests{,/log}
- # Create a symlink to provided binaries so the tests can find
them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults
"${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" ||
die
- mysql-multilib_disable_test main.perror "String
mismatch due to not building local perror"
- fi
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
- # These are failing in Percona 5.6 for now and are believed to
be
+ # These are failing in MySQL 5.5/5.6 for now and are believed
to be
# false positives:
#
# main.information_schema,
binlog.binlog_statement_insert_delayed,
- # main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql
funcs_1.is_triggers
- # engines/funcs.db_alter_character_set
engines/funcs.db_alter_character_set_collate
- # engines/funcs.db_alter_collate_ascii
engines/funcs.db_alter_collate_utf8
- # engines/funcs.db_create_character_set
engines/funcs.db_create_character_set_collate
+ # funcs_1.is_triggers funcs_1.is_tables_mysql,
+ # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+ # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+ # mysqld--help-notwin, funcs_1.is_triggers,
funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+ # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix,
binlog.binlog_mysqlbinlog_filter
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource
limits.
#
- # main.percona_bug1289599
- # Looks to be a syntax error in the test file itself
- #
- # main.variables main.myisam main.merge_recover
- # fails due to ulimit not able to open enough files (needs 5000)
+ # rpl.rpl_plugin_load
+ # fails due to included file not listed in expected result
+ # appears to be poor planning
#
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
- # Called with bad parameters should be reported upstream
- #
-
- for t in main.mysql_client_test \
- binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin
binlog.binlog_mysqlbinlog_filter \
- perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
- funcs_1.is_columns_mysql funcs_1.is_tables_mysql
funcs_1.is_triggers \
- main.variables main.myisam main.merge_recover \
- engines/funcs.db_alter_character_set
engines/funcs.db_alter_character_set_collate \
- engines/funcs.db_alter_collate_ascii
engines/funcs.db_alter_collate_utf8 \
- engines/funcs.db_create_character_set
engines/funcs.db_create_character_set_collate \
- main.percona_bug1289599 main.mysqlhotcopy_archive
main.mysqlhotcopy_myisam ; do
+ # fails due to bad cleanup of previous tests when run in
parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+ for t in \
+ binlog.binlog_mysqlbinlog_filter \
+ binlog.binlog_statement_insert_delayed \
+ funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql \
+ funcs_1.is_triggers \
+ main.information_schema \
+ main.mysql_client_test \
+ main.mysqld--help-notwin \
+ perfschema.binlog_edge_mix \
+ perfschema.binlog_edge_stmt \
+ rpl.rpl_plugin_load \
+ main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ ; do
mysql-multilib_disable_test "$t" "False
positives in Gentoo"
done
+ if ! use extraengine ; then
+ # bug 401673, 530766
+ for t in federated.federated_plugin ; do
+ mysql-multilib_disable_test "$t" "Test $t
requires USE=extraengine (Need federated engine)"
+ done
+ fi
+
# Run mysql tests
pushd "${TESTDIR}"
# Set file limits higher so tests run
ulimit -n 3000
- python_setup
+
# run mysql-test tests
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --testcase-timeout=30 --reorder
+ --suite-timeout=5000 --reorder
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
@@ -167,7 +168,6 @@ multilib_src_test() {
einfo "Tests successfully completed"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
b/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
index 4df5953..5641679 100644
--- a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
@@ -39,14 +39,16 @@ python_check_deps() {
}
src_configure() {
- local MYSQL_CMAKE_NATIVE_DEFINES="-DWITH_PAM=$(usex pam)"
+ local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_PAM=$(usex pam)
+ $(mysql-cmake_use_plugin tokudb TOKUDB)
+ )
if use tokudb ; then
# TokuDB Backup plugin requires valgrind unconditionally
- MYSQL_CMAKE_NATIVE_DEFINES+="
- $(mysql-cmake_use_plugin tokudb TOKUDB)
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
$(usex tokudb-backup-plugin ''
-DTOKUDB_BACKUP_DISABLED=1)
- "
+ )
fi
+ mysql-multilib-r1_src_configure
}
# Official test instructions:
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 5969d6b..72dcd68 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -110,7 +110,8 @@ if [[ -z ${SERVER_URI} ]]; then
URI_A="${URI_FILE}-${MY_PV}.tar.gz"
MIRROR_PV=$(get_version_component_range 1-2 ${PV})
# Recently upstream switched to an archive site, and not on
mirrors
-
SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}";
+
SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A}
+
http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}";
fi
fi
@@ -328,19 +329,7 @@ mysql-multilib-r1_src_configure() {
# Bug #114895, bug #110149
filter-flags "-O" "-O[01]"
- CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
- CXXFLAGS="${CXXFLAGS} -felide-constructors"
- # Causes linkage failures. Upstream bug #59607 removes it
- if ! mysql_version_is_at_least "5.6" ; then
- CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
- fi
- # As of 5.7, exceptions are used!
- if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least
"5.6.26" ; then
- CXXFLAGS="${CXXFLAGS} -fno-rtti"
- elif ! mysql_version_is_at_least "5.7" ; then
- CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
- fi
- export CXXFLAGS
+ append-cxxflags -felide-constructors -fno-rtti
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing
@@ -485,14 +474,14 @@ multilib_src_configure() {
# systemtap only works on native ABI bug 530132
if multilib_is_native_abi; then
- mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap) )
- [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=(
${MYSQL_CMAKE_NATIVE_DEFINES} )
+ mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap)
+ "${MYSQL_CMAKE_NATIVE_DEFINES[@]}" )
else
- mycmakeargs+=( -DENABLE_DTRACE=0 )
- [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=(
${MYSQL_CMAKE_NONNATIVE_DEFINES} )
+ mycmakeargs+=( -DENABLE_DTRACE=0
+ "${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" )
fi
- [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=(
${MYSQL_CMAKE_EXTRA_DEFINES} )
+ mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" )
cmake-utils_src_configure
}
