Fix sparc build and critical replication issue wrt MDEV-7237

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 974dab91ce8bdcab6635b96029712e66d9b90696..e9b80113e07594bf22e1111f55a5badf8427d83a 100644 (file)
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.72 2014/11/26 01:18:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.73 2014/12/15 03:10:25 grknight Exp $
+
+*mariadb-10.0.15-r1 (15 Dec 2014)
+
+  15 Dec 2014; Brian Evans <grknight@gentoo.org> +mariadb-10.0.15-r1.ebuild:
+  Fix sparc build and critical replication issue wrt MDEV-7237
 
 *mariadb-10.0.15 (26 Nov 2014)
 

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d3cb97c93a92b81a114708771f4a4c1d2cffe494..d1c844a61f646cd214dfab8c512d7572c0d0da3c 100644 (file)
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,18 +8,20 @@ DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2
 DIST mariadb-5.5.40.tar.gz 44745240 SHA256 cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512 178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac WHIRLPOOL 1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
 DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
 DIST mysql-extras-20141125-1930Z.tar.bz2 1494197 SHA256 a150a5680bb505a4187c16bc5a5f3ac09c3a83f71bd66b6cbd6111b8f0d25f8f SHA512 9e3e0cc99a54f936282ab5f5857e4a6308509f8686595f4a248542f43ca661732e26fd4703365c09a276d079c374e7f63bcd0ee6332d2c1b86e80298ac82b296 WHIRLPOOL 90eff797b33c859a0d2ad5fef8c9756ae86130fe21a6414ab95de45a135068d1d327e5e302431e3b78b26629ce66312955da25a9b8250e8b2596ef2ff5d270ad
+DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
+EBUILD mariadb-10.0.15-r1.ebuild 3964 SHA256 924e8bb6fbade8d3a3c25d99c732dff2c63b4399cd711b2c334bf5414b4b9d3f SHA512 1865bf5ee140649c7fd7e9c289010cee6b558ae70b6a21c44722ef8fd5a929047a575ecbc0df5c6000e6f378f6e5bef415d5202e360bfa395e82b63c6aa6d002 WHIRLPOOL d83bc9e131fa69df7b62acf176015c2dd5c8a574de9c7f528678bc806653a457dacfd36a88a3635ef1b49950b447b2f1bf9f538b8e3fb463a467bb43ae1fb1c9
 EBUILD mariadb-10.0.15.ebuild 3961 SHA256 b2179e5fec7eaf1fefa80c3b42ffd092a24c9a17d3f6eec403d89fe2d15b32c6 SHA512 0239cd225d29a9855055755352bdec6a8bb31946c8f94a5094dafa38c13ed2a9e50aed0cc5eb3996cc6bd9f012a0c79775f38c8e9dc3b642e393fb45dd980bd5 WHIRLPOOL 257b23574e16196530c8f04db7fa406a3aa96501466c5f48159d1eb15a229b7da6bae60a4d74a7d5bc611fb7dd8203a9f0e86fa5ffa2a53714056dedb074533b
 EBUILD mariadb-5.5.40-r1.ebuild 4136 SHA256 402a3d89fa048a84dd3f01eba236e30c2d1f953a5b5c2c3448251c028ee8e560 SHA512 d0ba7167e6fd4cc8c77225fcb734a1db1244d43e8f1b2f640d49686339a3d73bbcd1e6cf5a134737d0308d36fe2463bef2e784ebef87cb99cd8a3627485c46e8 WHIRLPOOL d19b191c74e93250d24dc37ae8972ecb6270cf5910eb40148ccb9217456acc30ade32a5e992dea0864727472d59aa88c63b7d32115d5b66f95fb50549bc2bd5c
-MISC ChangeLog 12728 SHA256 2a2e5bbc0297f06e9cbd45bfc86ec2113cdc1a10e83637079e087bd4d53c8e98 SHA512 058e6e36e9717c69af960316aa09adc9ec9b04cf90ba54c5b845dcf61b572697d640a9dc18c7212de90da8ca1cd6bbf40cfab8655692a725eb7230419e441a31 WHIRLPOOL bceaeee99035aaca48080e6abbe0e9bdbeae31c0d1d7200a3ab09fa3e9c50304db6f425f451ee846e6f2fa1fe334571a4403ab29b0d39d6857c76f2f3c83b8ee
+MISC ChangeLog 12904 SHA256 d4a9bb733ec5bf20a4d6ee4cf9808d21380efb6938363ac3cde74489b0c10ab2 SHA512 9f95a2ef86d504d81bcaab3ff013c82c619a0eb7e85f3cd7349b2d0af0623b0d20b1c65db4d939864e3351b7d7a189846059285191126f3393070b346db463fb WHIRLPOOL 5d7fc366a28378769ea2a6eea77866ed23571fbe11c4ae2d6932930e9e6b908a43b1f4b6a1429f70d3b5e1c2e35fd1dd655eaf0207cf2b023d1bb5c50bbc67cb
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUdSpvAAoJEE4V4vFnx44dSukH/2V8BH742qCFv0T4vypWysGf
-WFz5XewRibiUs/Bdf4ELp7NNh6RRBgB1cDbksEXl1hZa29d+9gaTmePWGLEUxlW3
-zs5KXp9eTpeZmR45qknbzjhcxQFO4HUwWuLKwYb5symS6IJ7diJ/oUS8yCu+P14n
-DzRMh198zWDEoiGSJ1+0aYadHFv//phjzZJwvTAK1Vwzw8kNuzxllV1EBtPaTDbh
-F80o/baJqZq0Kp0GgB1mEDywNRn1Kduz4bMcF+GVC0T+nyHz+OLIkyl6NbcQyxdF
-yvLFjHXZM628y3gIEDgl6r9b260yftJTHWMZGJx2posv1MQ27WBf/LqFNuzXYbI=
-=nt9k
+iQEcBAEBCAAGBQJUjlEoAAoJEE4V4vFnx44dzBEIAIBi4aFLWGiSxsuOnMdDAwSS
+wiRJNVgyVfXukSdT7fk9kfq5Dk3LHVHdvlebvagMaV1xDfuklzcO4vG/fJyYjQK1
+HHu+iuhkvrx8/VsHo2E/7VcvGbGLDc05Im2a62iEk4D30+oGvVeqb5RQCFe9Exbk
+FwQPsrZPxv/oJ3Ad01qNounTrO7tUib0OdU1dSoH864fDKaUKAE+0JPm21XmIDUk
+jRqhKDE68PX/WuBVj9mwKMMPvWUAyUozkwdqZ8aiWith1pmdz55pfZSxrouMuGAv
+qjzLuqcA7ghe9s3SGHl2Gegst8mg6ac358Czgc+xBO21GZ4b1zj7WYaqik+vBCo=
+=ts5j
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb/mariadb-10.0.15-r1.ebuild b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
new file mode 100644 (file)
index 0000000..96ff0f8
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.1 2014/12/15 03:10:25 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+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 ~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 )"
+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() {
+
+       if ! multilib_is_native_abi ; then
+               einfo "Server tests not available on non-native abi".
+               return 0;
+       fi
+
+       local TESTDIR="${BUILD_DIR}/mysql-test"
+       local retstatus_unit
+       local retstatus_tests
+
+       # Bug #213475 - MySQL _will_ object strenously if your machine is named
+       # localhost. Also causes weird failures.
+       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+       if ! use "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))"
+               # Enable parallel testing, auto will try to detect number of cores
+               # You may set this by hand.
+               # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+               export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+               # create directories because mysqladmin might right out of order
+               mkdir -p "${T}"/var-tests{,/log}
+
+               # 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
+               # main.mysql_client_test_comp:
+               # segfaults at random under Portage only, suspect resource limits.
+               #
+
+               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 \
+                       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"
+
+               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
+}