commit: 4a3720d1c2a61d3185be2985e3be6ef52fdab1d9
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 19:11:43 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 19:11:43 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4a3720d1
Sync from tree
---
dev-db/mariadb/Manifest | 5 +-
.../mariadb-10.0.14-r1.ebuild} | 56 ++++++++++-----------
.../mariadb-5.5.40-r1.ebuild} | 29 +++++------
dev-db/mysql/Manifest | 1 +
dev-db/mysql/mysql-5.5.40.ebuild | 4 +-
...{mysql-5.5.40.ebuild => mysql-5.6.21-r1.ebuild} | 57 ++++++++++++++--------
6 files changed, 83 insertions(+), 69 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7251554..aa0a955 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,8 +5,11 @@ DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645a
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.39.tar.gz 45084762 SHA256
cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14 SHA512
a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67
WHIRLPOOL
d1c3efdb2ff4de1830e8d5f03709b7c7a1e037a07902fce3253473a241b62f15b3ccb54896e4ca048ecd952acc84577cfc0788632a2c4aa77694f86fe48f1089
+DIST mariadb-5.5.40.tar.gz 44745240 SHA256
cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512
178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac
WHIRLPOOL
1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
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
DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256
28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512
d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c
WHIRLPOOL
531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
+DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256
9a32dcc646c86cb8f9a941f4da6fd9fc183c0bd60faf47331d465e422ff7b8ac SHA512
d4eb8451a894206cc2d1f3431f6106a910495d357cc07b4e6088b545fc39a995a1d230a307467da73c8c6b11efa0eda634150e09a486a9c53fb063c7fa8d9bbc
WHIRLPOOL
f57573e6d3ca9f37c666848f07f65f963ed70cfe4e3408730e96be68073251a7611cad068c1d84a5fbfe42ee7c5f9e161d7962dcf591e6eae856ef1cfd286e9f
DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256
958114bbe5fe21220f27b478c67a9ad3edd8d88fc58b528c6e7b5cf20e46dabb SHA512
b5fc435804b5843ecb9e522dbc8c6b5d2bb9bc8a7c39633032aaf566f2a2488fc6c0017a92dd6db95db6c14d06d25c43a67fb2387818a0060611c3c811491037
WHIRLPOOL
a6a3b1953180923882de75d2e15cdbbf29f42c90947c88e1b29ceee3a2d8094eb5ee015ce2f38b13dbb84d52120be9e867618c90b655ffeec10d32947ce625d0
+DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256
b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512
b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e
WHIRLPOOL
35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
+DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256
9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512
c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799
WHIRLPOOL
bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild
b/dev-db/mariadb/mariadb-10.0.14-r1.ebuild
similarity index 68%
copy from dev-db/mysql/mysql-5.5.40.ebuild
copy to dev-db/mariadb/mariadb-10.0.14-r1.ebuild
index 0abce41..1677a50 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.14-r1.ebuild
@@ -1,25 +1,16 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14-r1.ebuild,v
1.1 2014/10/19 20:31:51 grknight Exp $
EAPI="5"
+MY_EXTRAS_VER="20141019-1948Z"
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
+inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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=''
@@ -27,18 +18,19 @@ 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 mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
-src_test() {
+multilib_src_test() {
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -71,31 +63,33 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p "${T}"/var-tests{,/log}
- # create symlink for the tests to find mysql_tzinfo_to_sql
- ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
- # These are failing in MySQL 5.5 for now and are believed to be
+ # 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-notwin
+ # 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, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource
limits.
+ #
- for t in main.mysql_client_test \
+ for t in main.mysql_client_test main.mysql_client_test_nonblock
\
+ main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin ; do
- mysql-v2_disable_test "$t" "False positives in
Gentoo"
+ main.mysqld--help \
+ funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
+ mysql-multilib_disable_test "$t" "False
positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --testcase-timeout=30
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild
b/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
similarity index 81%
copy from dev-db/mysql/mysql-5.5.40.ebuild
copy to dev-db/mariadb/mariadb-5.5.40-r1.ebuild
index 0abce41..42476ee 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
@@ -1,25 +1,19 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.40-r1.ebuild,v
1.3 2014/10/18 14:09:07 ago Exp $
EAPI="5"
+MY_EXTRAS_VER="20141017-1419Z"
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
+# Build system
BUILD="cmake"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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=''
@@ -34,7 +28,7 @@ RDEPEND="${RDEPEND}"
# Official test instructions:
# USE='-cluster embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
@@ -74,19 +68,22 @@ src_test() {
# 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
+ # These are failing in MariaDB 5.5 for now and are believed to
be
# false positives:
#
# main.information_schema,
binlog.binlog_statement_insert_delayed,
- # main.mysqld--help-notwin
+ # 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, main.mysql_client_test_nonblock:
# segfaults at random under Portage only, suspect resource
limits.
+ #
- for t in main.mysql_client_test \
+ for t in main.mysql_client_test main.mysql_client_test_nonblock
\
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin ; do
+ 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
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index dec8675..0f53d49 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,5 +13,6 @@ DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256
95e531799ed267c566da8b07
DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256
75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512
d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a
WHIRLPOOL
2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256
a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512
b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c
WHIRLPOOL
41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
+DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256
9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512
c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799
WHIRLPOOL
bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
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/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
index 0abce41..aee682a 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.40.ebuild
@@ -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/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.12
2014/10/18 14:09:03 ago 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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=''
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild
b/dev-db/mysql/mysql-5.6.21-r1.ebuild
similarity index 67%
copy from dev-db/mysql/mysql-5.5.40.ebuild
copy to dev-db/mysql/mysql-5.6.21-r1.ebuild
index 0abce41..6cfa933 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.6.21-r1.ebuild
@@ -1,25 +1,19 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21-r1.ebuild,v 1.1
2014/10/19 20:27:12 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20140801-1950Z"
+MY_EXTRAS_VER="20141019-1948Z"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
+inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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=''
@@ -36,7 +30,12 @@ RDEPEND="${RDEPEND}"
# FEATURES='test userpriv -usersandbox' \
# ebuild mysql-X.X.XX.ebuild \
# digest clean package
-src_test() {
+multilib_src_test() {
+
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
local retstatus_unit
@@ -74,28 +73,48 @@ src_test() {
# 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
+ # 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
+ # 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.
-
- for t in main.mysql_client_test \
- binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin ; do
- mysql-v2_disable_test "$t" "False positives in
Gentoo"
+ #
+ # rpl.rpl_plugin_load
+ # fails due to included file not listed in expected result
+ # appears to be poor planning
+ 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-notwinfuncs_1.is_triggers \
+ perfschema.binlog_edge_mix \
+ perfschema.binlog_edge_stmt \
+ rpl.rpl_plugin_load \
+ ; do
+ mysql-multilib_disable_test "$t" "False
positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}"
+ # Set file limits higher so tests run
+ ulimit -n 3000
+
# run mysql-test tests
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --testcase-timeout=30
+ --suite-timeout=5000
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
