* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 10+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 82b01b4996a8127ac0e35be646bb198a68129f9c
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Apr 5 15:58:43 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:58:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=82b01b49
Testing changes
Added latin1 -> utf8 exceptions
Insert main test disabled to the correct location for both mysql and mariadb
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/mariadb-5.5.22.ebuild | 12 +++++++-----
eclass/mysql-cmake.eclass | 9 +++++++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1df58ee..78f33cc 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -22,6 +22,6 @@ EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c070795
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
EBUILD mariadb-5.3.5.ebuild 6000 RMD160 b6c1c4b485967317db5bcaae207b8f6749d98835 SHA1 7f1629a9841bead95db0fe2d08775de2cc12ada4 SHA256 ff07e304ee3838b2ac5b2b0e4ec5e2792950ee51ace18979a4a96cbaf3cefca8
-EBUILD mariadb-5.5.22.ebuild 4185 RMD160 0e2318660c0bd819d3322d7603c5d0331d43690c SHA1 bdfce457bcdac9ca4f413c99da0207fac50e49e2 SHA256 6ea2028f635eb85cbcaea2861889a2c7cf9291f1a5fdcfc9535a7d5126716560
+EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
index affe46f..96d53a5 100644
--- a/dev-db/mariadb/mariadb-5.5.22.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -71,10 +71,11 @@ src_test() {
# 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.
#
# sys_vars.plugin_dir_basic
@@ -95,10 +96,11 @@ src_test() {
# fails because portage strips out the USER enviornment variable
#
- 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 main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket ; do
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 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
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d625eec..fb0ab11 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -33,9 +33,14 @@ mysql-cmake_disable_test() {
testsuite="${rawtestname/.*}"
testname="${rawtestname/*.}"
- mysql_disable_file="${S}/mysql-test/t/disabled.def"
+ for mysql_disabled_file in \
+ ${S}/mysql-test/disabled.def \
+ ${S}/mysql-test/t/disabled.def ; do
+ [ -f "${mysql_disabled_file}" ] && break
+ done
+ #mysql_disabled_file="${S}/mysql-test/t/disabled.def"
#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
- echo ${testname} : ${reason} >> "${mysql_disable_file}"
+ echo ${testname} : ${reason} >> "${mysql_disabled_file}"
if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then
for mysql_disabled_file in \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2013-10-29 17:46 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2013-10-29 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 1d826337195a43c7542ae47f43aa8da98c700dbb
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Oct 29 17:46:33 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Oct 29 17:46:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1d826337
[mariadb] Revbump to use tokudb patch and erase system depends
---
.../mariadb/{mariadb-5.5.33a.ebuild => mariadb-5.5.33a-r1.ebuild} | 4 ++--
eclass/mysql-v2.eclass | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.5.33a.ebuild b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
similarity index 96%
rename from dev-db/mariadb/mariadb-5.5.33a.ebuild
rename to dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
index 7e94379..57edaca 100644
--- a/dev-db/mariadb/mariadb-5.5.33a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
+MY_EXTRAS_VER="live"
# Build system
BUILD="cmake"
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b3c0676..503e768 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -199,7 +199,7 @@ case "${BUILD}" in
"autotools")
IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
;;
- "cmake"*)
+ cmake*)
IUSE="debug embedded minimal +perl selinux ssl static test"
;;
esac
@@ -259,10 +259,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
# Bug 441700 MariaDB >=5.3 include custom mytop
mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
- has tokudb ${IUSE} && DEPEND="${DEPEND} tokudb? (
- >=sys-devel/gcc-4.7[lto]
- app-arch/xz-utils
- )"
fi
# Having different flavours at the same time is not a good idea
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-01-18 23:28 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 10+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-01-18 23:28 UTC (permalink / raw
To: gentoo-commits
commit: a819369036821327db13cf0eeabdcde6339243c3
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 23:22:35 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:22:35 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a8193690
Add mariadb-5.5.32-r1 to test a cmake patch to split the location of embedded from client libs.
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.32-r1.ebuild | 128 ++++++++++++++++++++++++++++++++
eclass/mysql-cmake.eclass | 11 +--
3 files changed, 135 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 54d9862..6d6f949 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,3 +8,4 @@ DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
+DIST mysql-extras-20140117-1443Z.tar.bz2 1479705 SHA256 759309bda0b6a5e0d094f20b0aea4ee7259710532e68511194bca952107442a9 SHA512 b3acf17c75ff9cdd2c467080a0fe10b1d6210dcdde76bc1902f6dd53a06fe6b2b3b216dd3aabf9bf2ff0d68f54267c9618645f19daaea829292fb88a31b822f5 WHIRLPOOL 2cffc52a9162fb3f3b91ec13c099ecf99c82fd84087ddbe67761f7052a3e13f2eebb6fb5715655688f472ad320fc0c295dff7be93c767435c4f3493903c3e3e7
diff --git a/dev-db/mariadb/mariadb-5.5.32-r1.ebuild b/dev-db/mariadb/mariadb-5.5.32-r1.ebuild
new file mode 100644
index 0000000..b22f460
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.32-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20140117-1443Z"
+
+# 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}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, 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.
+ #
+ # 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:00000001: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 main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 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
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4da7ede..615a579 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -311,7 +311,8 @@ mysql-cmake_src_configure() {
-DINSTALL_DOCREADMEDIR=share/doc/${P}
-DINSTALL_INCLUDEDIR=include/mysql
-DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)/mysql
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_ELIBDIR=$(get_libdir)/mysql
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-DINSTALL_MYSQLSHAREDIR=share/mysql
@@ -471,10 +472,10 @@ mysql-cmake_src_install() {
done
fi
- cat <<-EOF > "${T}"/80mysql-libdir
- LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
- EOF
- doenvd "${T}"/80mysql-libdir
+# cat <<-EOF > "${T}"/80mysql-libdir
+# LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+# EOF
+# doenvd "${T}"/80mysql-libdir
#Remove mytop if perl is not selected
[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-05-14 20:02 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2014-05-14 20:02 UTC (permalink / raw
To: gentoo-commits
commit: ed250aba50eb57032dda42f4774efe4d123f0bfb
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 20:02:26 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 20:02:26 2014 +0000
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 0000000..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, 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 usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b548e40..10281c4 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -255,9 +255,11 @@ if [[ ${PN} == "mysql-cluster" ]] ; then
fi
# prefix: first need to implement something for #196294
+# TODO: check emul-linux-x86-db dep when it is multilib enabled
RDEPEND="${DEPEND}
!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
selinux? ( sec-policy/selinux-mysql )
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
"
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-07-01 20:48 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2014-07-01 20:48 UTC (permalink / raw
To: gentoo-commits
commit: ae6c50aa500067df76eaf18bc92acab8eda6308c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 1 20:47:57 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Jul 1 20:47:57 2014 +0000
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 0000000..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 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-multilib_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # 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 || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 908e66e..4578020 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -76,9 +76,9 @@ mysql-cmake_disable_test() {
mysql-cmake_use_plugin() {
[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
if use_if_iuse $1 ; then
- echo "-DWITH_$2=1"
+ echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
else
- echo "-DWITHOUT_$2=1 -DWITH_$2=0"
+ echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
fi
}
@@ -129,7 +129,15 @@ configure_cmake_minimal() {
-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-DWITHOUT_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+ -DPLUGIN_ARCHIVE=NO
+ -DPLUGIN_BLACKHOLE=NO
+ -DPLUGIN_CSV=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_HEAP=NO
+ -DPLUGIN_INNOBASE=NO
+ -DPLUGIN_MYISAMMRG=NO
+ -DPLUGIN_MYISAM=NO
+ -DPLUGIN_PARTITION=NO
)
}
@@ -191,10 +199,12 @@ configure_cmake_standard() {
# CassandraSE needs Apache Thrift which is not in portage
mycmakeargs+=(
-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
+ -DPLUGIN_CASSANDRA=NO
$(mysql-cmake_use_plugin extraengine SEQUENCE)
$(mysql-cmake_use_plugin extraengine SPIDER)
$(mysql-cmake_use_plugin extraengine CONNECT)
-DCONNECT_WITH_MYSQL=1
+ -DPLUGIN_CONNECT_WITH_MYSQL=YES
$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
$(cmake-utils_use odbc CONNECT_WITH_ODBC)
)
@@ -309,9 +319,7 @@ mysql-cmake_src_configure() {
-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 )
- else
+ if in_iuse bindist ; then
mycmakeargs+=(
-DWITH_READLINE=$(usex bindist 1 0)
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
@@ -319,6 +327,8 @@ mysql-cmake_src_configure() {
)
fi
+ mycmakeargs+=( -DWITH_EDITLINE=system )
+
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mycmakeargs+=(
-DWITH_JEMALLOC=$(usex jemalloc system)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 53df055..42f965e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -303,7 +303,7 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
~virtual/mysql-${MYSQL_PV_MAJOR}"
# my_config.h includes ABI specific data
-MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
#
# HELPER FUNCTIONS:
@@ -430,16 +430,15 @@ multilib_src_configure() {
-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 )
- else
+ if in_iuse bindist ; then
mycmakeargs+=(
-DWITH_READLINE=$(usex bindist 1 0)
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
- $(usex bindist -DHAVE_BFD_H=0)
+ $(usex bindist -DHAVE_BFD_H=0 '')
)
fi
+ mycmakeargs+=( -DWITH_EDITLINE=system )
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
mycmakeargs+=(
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-10-22 19:35 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2014-10-22 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 5042c7e9c3d00949a820c4c93f8ab01b140e5e24
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 19:35:10 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 19:35:10 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5042c7e9
Fix up MariaDB 10.1.1 with new compression patches and note which patches need a respin
---
dev-db/mariadb/mariadb-10.1.1_alpha.ebuild | 4 ++--
eclass/mysql-cmake.eclass | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
index 4fb6c32..d308efa 100644
--- a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20140514-0124Z"
+MY_EXTRAS_VER="live"
WSREP_REVISION="25"
inherit toolchain-funcs mysql-multilib
@@ -14,7 +14,7 @@ IUSE="$IUSE"
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=''
+EPATCH_EXCLUDE='01050_all_mariadb_mysql_config_cleanup-5.5.patch 20006_all_cmake_elib-mariadb-10.0.11.patch'
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4abbd95..c57401f 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -214,8 +214,8 @@ configure_cmake_standard() {
fi
if mysql_version_is_at_least "10.1.1" ; then
- mycmakeargs+=( $(cmake-utils_use_has innodb-lz4 LZ4)
- $(cmake-utils_use_has innodb-lzo LZO) )
+ mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4)
+ $(cmake-utils_use_with innodb-lzo INNODB_LZO) )
fi
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-10-22 19:35 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2014-10-22 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 4b0aea37adf82271143b3d4d07a90d82b21a2a95
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 16:55:11 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 16:55:11 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4b0aea37
Add innodb compression options for MariaDB 10.1
---
dev-db/mariadb/metadata.xml | 2 ++
eclass/mysql-cmake.eclass | 5 +++++
eclass/mysql-multilib.eclass | 9 +++++++++
3 files changed, 16 insertions(+)
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 4ff7fec..9069bcb 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -14,6 +14,8 @@ dev-db/mariadb
<flag name='embedded'>Build embedded server (libmysqld)</flag>
<flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
<flag name='galera'>Enables galera replication</flag>
+ <flag name='innodb-lz4'>Enables lz4 compression methods for InnoDB/XtraDB</flag>
+ <flag name='innodb-lzo'>Enables lzo compression methods for InnoDB/XtraDB</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='libevent'>Use libevent for connection handling</flag>
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index bae11ca..4abbd95 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -212,6 +212,11 @@ configure_cmake_standard() {
if in_iuse galera ; then
mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
fi
+
+ if mysql_version_is_at_least "10.1.1" ; then
+ mycmakeargs+=( $(cmake-utils_use_has innodb-lz4 LZ4)
+ $(cmake-utils_use_has innodb-lzo LZO) )
+ fi
fi
if [[ ${PN} == "percona-server" ]]; then
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 0f3895b..b7ff8af 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -205,6 +205,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \
REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )"
REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
+
+ # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries
+ # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries
+ mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo"
fi
if [[ -n "${WSREP_REVISION}" ]]; then
@@ -279,6 +283,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
fi
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
+
+ mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND}
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ "
fi
[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2014-12-10 1:18 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2014-12-10 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 8ee092ca461038a7f272be92e95149cc837acc04
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 10 01:18:34 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Dec 10 01:18:34 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8ee092ca
Version bump to MariaDB 10.1.2
---
dev-db/mariadb/Manifest | 2 +-
....1_alpha.ebuild => mariadb-10.1.2_alpha.ebuild} | 36 ++++++++++++----------
dev-db/mariadb/metadata.xml | 1 +
eclass/mysql-cmake.eclass | 4 +++
eclass/mysql-multilib.eclass | 5 +++
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 49706d4..0495c21 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,6 @@
DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
-DIST mariadb-10.1.1.tar.gz 48093370 SHA256 0076c00679a17d35c51fc99841817500131dc8501dc8540aabbc7bcd56d6bb6e SHA512 fc33e6d868d620cc66bc77b9819f18604cc5c5bccd0229c0a0d0e40184cbda0c3304d2648581f977e9cbe759add525066189764f068974b4285da91b807ce36c WHIRLPOOL 705675e3aa035252f6c6126412dd5c637cbef77edb664bdad42fa7cd5123361af838c4501a1d84ba908b7a2effcb0bd54acf5d821c4800b54a453ec55ab76cf5
+DIST mariadb-10.1.2.tar.gz 52586559 SHA256 411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421 WHIRLPOOL 67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
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.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.2_alpha.ebuild
similarity index 77%
rename from dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
rename to dev-db/mariadb/mariadb-10.1.2_alpha.ebuild
index d308efa..c4d9809 100644
--- a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.2_alpha.ebuild
@@ -11,10 +11,10 @@ inherit toolchain-funcs mysql-multilib
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"
+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='01050_all_mariadb_mysql_config_cleanup-5.5.patch 20006_all_cmake_elib-mariadb-10.0.11.patch'
+EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
@@ -26,12 +26,15 @@ RDEPEND="${RDEPEND}"
# digest clean package
multilib_src_test() {
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
- 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"
@@ -53,9 +56,13 @@ multilib_src_test() {
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MariaDB 10.0 for now and are believed to be
# false positives:
@@ -65,31 +72,30 @@ multilib_src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# 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 \
+ main.mysql_client_test_comp \
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-multilib_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
- pushd "${TESTDIR}" || die
+ 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
+ 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"
- popd || die
+ popd
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
@@ -103,8 +109,6 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
- # Cleanup test data after a successful run
- rm -r "${S}/mysql-test/var-tests"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 9069bcb..421187f 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -22,6 +22,7 @@ dev-db/mariadb
<flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
<flag name='minimal'>Install client programs only, no server</flag>
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
+ <flag name='pam'>Enable the optional PAM authentication plugin for the server</flag>
<flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
<flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index b7f4799..05ff5ed 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -232,6 +232,10 @@ configure_cmake_standard() {
mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4)
$(cmake-utils_use_with innodb-lzo INNODB_LZO) )
fi
+
+ if mysql_version_is_at_least "10.1.2" ; then
+ mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) )
+ fi
else
mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) )
fi
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index ba5b299..387b875 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -209,6 +209,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
# MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries
# Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo"
+
+ # 10.1.2 introduces a cracklib password checker
+ mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib"
fi
if [[ -n "${WSREP_REVISION}" ]]; then
@@ -288,6 +291,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
innodb-lz4? ( app-arch/lz4 )
innodb-lzo? ( dev-libs/lzo )
"
+
+ mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )"
fi
[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2015-09-11 20:53 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2015-09-11 20:53 UTC (permalink / raw
To: gentoo-commits
commit: f3927611324921951c1c7cbc877913b4d8fc3df5
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 20:57:35 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 20:57:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f3927611
dev-db/mariadb: Add dependency and USE for app-arch/snappy; Update Manifest
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/metadata.xml | 1 +
eclass/mysql-cmake.eclass | 4 ++++
eclass/mysql-multilib.eclass | 4 ++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bfb286e..e5d3bb1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,7 @@
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
-DIST mariadb-10.1.5.tar.gz 53573071 SHA256 af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512 50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f WHIRLPOOL b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
+DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
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/metadata.xml b/dev-db/mariadb/metadata.xml
index 01c1e4d..0f1b981 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -17,6 +17,7 @@ dev-db/mariadb
<flag name='galera'>Enables galera replication</flag>
<flag name='innodb-lz4'>Enables lz4 compression methods for InnoDB/XtraDB</flag>
<flag name='innodb-lzo'>Enables lzo compression methods for InnoDB/XtraDB</flag>
+ <flag name='innodb-snappy'>Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='libevent'>Use libevent for connection handling</flag>
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 9556ac2..675a986 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -236,6 +236,10 @@ configure_cmake_standard() {
$(cmake-utils_use_with innodb-lzo INNODB_LZO) )
fi
+ if in_iuse innodb-snappy ; then
+ mycmakeargs+=( $(cmake-utils_use_with innodb-snappy INNODB_SNAPPY) )
+ fi
+
if mysql_version_is_at_least "10.1.2" ; then
mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) )
fi
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 6f7b583..35f5d69 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -231,6 +231,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
# Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo"
+ # It can also compress with app-arch/snappy
+ mysql_version_is_at_least "10.1.7" && IUSE="${IUSE} innodb-snappy"
+
# 10.1.2 introduces a cracklib password checker
mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib"
fi
@@ -364,6 +367,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
"
mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )"
+ mysql_version_is_at_least "10.1.7" && DEPEND="${DEPEND} innodb-snappy? ( app-arch/snappy )"
fi
if [[ ${PN} == "percona-server" ]] ; then
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/
@ 2015-10-19 17:29 Brian Evans
0 siblings, 0 replies; 10+ messages in thread
From: Brian Evans @ 2015-10-19 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 1cb156e32f42f1305fc788e60249679769918080
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 17:29:15 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 17:29:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1cb156e3
dev-db/mariadb: Version bump to 10.1.8 GA
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/Manifest | 24 +------
dev-db/mariadb/mariadb-10.1.8.ebuild | 128 +++++++++++++++++++++++++++++++++++
eclass/mysql-multilib.eclass | 4 ++
3 files changed, 134 insertions(+), 22 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b5bda06..bc1dec1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
+DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
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
@@ -14,22 +12,4 @@ DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6d
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJWG/0EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2At0P/jB8CYOdFb5gOMj434bkuJ8r
-Tkb3KdKxnCurHykSenhoMEve0l37E3/Sf+0onv83/dxtJLq46qq7XXFLlvwGtN7Y
-AuMro1Qzxgl5bMrjq79lBr5+gQFKSjNfmOKSeyh50lgYoblhg652TcxqA6lj/yIv
-IQmvWVhqQnsUC1UXeI3D/oS7mrDuYC4DFh5Tyj1XSTDI07mBHUWQSpG60E8xd0SY
-zNlTrVN6T7EgfbWRz8+sTxdZR8a4x4HUSpc21AjOIApbw69FcpZhyVvJVh1qBBFT
-REyaeafMv+Sfq/x8caNcUHSPxFIxvkapaBdM3bJr0LgVB8d81EGHBvBtMzw/NfbK
-xJ+W2PN8Qna3isCtc3h/USn8pOuyMZl/lhYceWb4bmzOWjsifi4eyCuU7vNWZzct
-EB1OAqu9xdv3/BY8Lle5iV8/dikEczkJ+YEsoIcxSb9oT+/cckuRayAyxscZQIMR
-jN/66nGq0yByOnZTkJZGyKDfafqBcZcC1HI/a6vneLivap//9JNEL1bfEUMOra07
-qYn98V04OTag2HJvc6v/wArisxjlEX9xtaOOor39uW3UXcfXgURC2/BycPyBadjJ
-BigDrYgoaNQCo+ZJj3VaU1xXYwCbi72+5LgCarDh9RD9ueaIozzkHHfhyAbc8bFO
-O+2gNMikvRRI0qN7PzCV
-=e9Dj
------END PGP SIGNATURE-----
+DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
diff --git a/dev-db/mariadb/mariadb-10.1.8.ebuild b/dev-db/mariadb/mariadb-10.1.8.ebuild
new file mode 100644
index 0000000..08140db
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.8.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151019-1714Z"
+WSREP_REVISION="25"
+SUBSLOT="18"
+HAS_TOOLS_PATCH="yes"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE mroonga systemd"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ systemd? ( sys-apps/systemd:= )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+ if ! multilib_is_native_abi ; then
+ einfo "Server tests not available on non-native abi".
+ return 0;
+ fi
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if use server ; then
+
+ # 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 [[ $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"
+
+ # 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
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ 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" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index c967901..0cbbf8e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -647,6 +647,10 @@ multilib_src_configure() {
-DWITH_DEFAULT_FEATURE_SET=0
)
+ if in_iuse systemd ; then
+ mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+ fi
+
if use openssl || use libressl ; then
mycmakeargs+=( -DWITH_SSL=system )
else
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-10-19 17:29 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-22 19:35 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2015-10-19 17:29 Brian Evans
2015-09-11 20:53 Brian Evans
2014-12-10 1:18 Brian Evans
2014-10-22 19:35 Brian Evans
2014-07-01 20:48 Brian Evans
2014-05-14 20:02 Brian Evans
2014-01-18 23:28 Jorge Manuel B. S. Vicetto
2013-10-29 17:46 Brian Evans
2012-07-27 16:09 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox