[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/

["Brian Evans" <grknight@gentoo.org>]

commit:     1e70022facc519de2f3b12c26191f0a021faa862
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 21:31:19 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 21:31:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1e70022f

dev-db/mysql: Version bump in 5.7 series.

Just about done but needs major tree work to be included

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog           |   8 +-
 dev-db/mysql/Manifest            |  23 +++++
 dev-db/mysql/mysql-5.7.17.ebuild | 210 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 240 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d98dac7..e290fc0 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.7.17 (03 Jan 2017)
+
+  03 Jan 2017; Brian Evans <grknight@gentoo.org> +mysql-5.7.17.ebuild:
+  dev-db/mysql: Version bump in 5.7 series.  Just about done but needs major
+  tree work to be included
+
   29 Apr 2016; Brian Evans <grknight@gentoo.org> mysql-5.7.12.ebuild:
   dev-db/mysql: Force a download of boost-1.59 and use it in the build.  Only a
   portion is actually used

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5ee3cdf..1703e16 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
@@ -8,6 +11,7 @@ DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
 DIST mysql-5.7.12.tar.gz 50571897 SHA256 32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87 SHA512 a36013f3af9a15f8e9abec7673485ca1dd5532afcc0e2570659f510da1a1763af8de478231c5723d2395f635a6956d1500652999fedf344f7d8970265860eea5 WHIRLPOOL 9d0486ae3b8ab404f5e03829d12a477f8a990a959e32286d4920fd8bdf18689e693249be3a9f0e93e61c6a6e953846e1546620ecdeb834c4e69c45bf676a2670
+DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -16,3 +20,22 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlhsGCdfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7ZbuxAAxTdP9YqM+Iv9cWrH3RVWP1RZpxCtDUIirM5c3PE88V1cZo9Aalujp7rC
+A4aOMcUQa4f2kJcgt4sDDEnn1eWTdlKHd4FNb0v8NF0Gk0JyO5i0Jx6YH4Aez1UP
++f2wb3IA82H/GEJgp33F03+fzMjkscMZpEafARDwyrAWNjgEe58guOD39jnLgCR+
+RjifAD8isQ1Cv+FSrWZ4hIflBVaQbE6YqKxMqRlvpwK636dmpH+mvUhzljaX3+7A
+FzihMfKMKMhaYy8kXbZYVnHzZPlu4EAq1pZ7QCxv5qX3IoCiU8hsCzpNzhy8JiRO
+ETnW/c0gKjHdp+10chcQfcSohrP+9HWjSYi79JwnA4FEs8H1kGR7UsTQTO/+Hs0G
+WV++yR91slnV8TQhUVV6gU+3FZcEeSqzAtAhdxl7umUAV57ArekxqM1ezKUvvCF1
+UDAEk3fCFWSpCh75Oq2dq2jyYSqvTKrbmanDjiUAsx7yGsPNnIlkiKLydRns9N/7
+PoeejdQvzsb9qCmGiy270opLaB+2BpcJT0yFwikQvKvPyQe36jbQLdAjGxnUKbr5
+XUVRtahN4bK62bzFGwL2PXUuHK9gAUHLT0A0hUnFgs1ZixihNuDMrbjDq77xUSOb
+ZEect3ybZNxb436eFyGqGUxPTOmA8LBZe7B5lSowquf9OGtDXAE=
+=OCNp
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
new file mode 100644
index 0000000..8a6a1f9
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+SUBSLOT="20"
+
+SERVER_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${MY_PV}.tar.gz"
+MY_SOURCEDIR="${PN}-${MY_PV}"
+inherit mysql-multilib-r1
+
+IUSE="cjk"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~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 )
+	>=app-arch/lz4-0_p131:=
+	cjk? ( app-text/mecab )"
+RDEPEND="${RDEPEND}"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
+)
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_prepare() {
+	mysql-multilib-r1_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+	# Remove dozens of test only plugins by deleting them
+	if ! use test ; then
+		rm -r "${S}"/plugin/{test_service_sql_api,test_services,udf_services} || die
+	fi
+	# Remove CJK Fulltext plugin
+	if ! use cjk ; then
+		rm -r "${S}"/plugin/fulltext || die
+	fi
+}
+
+src_configure() {
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+		-DWITH_BOOST="${S}/boost/boost_1_59_0"
+	)
+	# This is the CJK fulltext plugin, not related to the complete fulltext indexing
+	if use cjk ; then
+		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITH_MECAB=system  )
+	else
+		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_FULLTEXT=1  )
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 server ; 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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# 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.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		#
+		# main.events2
+		# Event creation is in the past and automatically dropped
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			main.events_2 \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		if ! use cjk ; then
+			for t in innodb_fts.ngram_2 innodb_fts.ngram_1 innodb_fts.ngram ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=cjk"
+			done
+		fi
+
+		# 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" \
+			--suite-timeout=5000 --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
+}