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

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     f260fec2767adf3b1bbc9cb4c9e5ff3a7cd2889d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 02:35:05 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 02:35:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f260fec2

A few more updates for mysql-5.5.10 including a reworked patch from upstream ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.

---
 dev-db/mysql/ChangeLog           |    5 +
 dev-db/mysql/Manifest            |    4 +-
 dev-db/mysql/mysql-5.5.10.ebuild |  163 +++-----------------------------------
 eclass/mysql-autotools.eclass    |    2 +-
 eclass/mysql-cmake.eclass        |   11 +++-
 5 files changed, 30 insertions(+), 155 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index efc8ea2..8cfdfc7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild:
+  A few more updates for mysql-5.5.10 including a reworked patch from upstream
+  ( http://lists.mysql.com/commits/102373 ) to build a shared libmysqld.
+
 *mysql-5.5.10 (17 Mar 2011)
 
   17 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index be972aa..4cb9230 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
 EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
 EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
 EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.5.10.ebuild 6866 RMD160 bfc0e6b14720be2cf70e6291c6e12600fac8dd3a SHA1 06d16abd5266064f67ad745c2263bf90b57715ec SHA256 0bf345406c9ada42dcbb94d94bac566e1b11d11d048dae34d08291687da570f7
+EBUILD mysql-5.5.10.ebuild 1913 RMD160 716bb2197d8790d8dfbf996223a4c6abf3836639 SHA1 6d0f2879e5e5e18b3f66d153374cdc5a4c644b4f SHA256 db1260b85a0ec3dd9323adffac4b44397fda52a1e5e73c512f5c188b8338df35
 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e0d7841c840c66be06fa7373b36721dbe12374cfe
+MISC ChangeLog 4389 RMD160 b57fd793c05239bdad046f044f8bb4ef2ec29924 SHA1 5207863d191de47f78c9b1d3f50388ea72693649 SHA256 065505f5d27103b349b53c62a580313d82ffb1409dd7c49b71da1352ceadef9d
 MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574

diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index 309b9f1..1df83d3 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
 
-MY_EXTRAS_VER="20100201-0104Z"
+MY_EXTRAS_VER="live"
 EAPI=2
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
@@ -32,169 +32,30 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
 src_test() {
+
+	TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+
 	# 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"
 
-	emake check || die "make check failed"
 	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		make -j1 test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
 
-		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		# Run CTest
+		cmake-utils_src_test
 
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
+		# Run mysql tests
+		pushd "${TESTDIR}"
+		perl mysql-test-run.pl
+		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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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-autotools.eclass b/eclass/mysql-autotools.eclass
index 6d8bf95..f18e4eb 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -24,7 +24,7 @@
 # @FUNCTION: mysql_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
-disable_test() {
+mysql-autotools_disable_test() {
 
 	local rawtestname testname testsuite reason mysql_disable_file
 	rawtestname="${1}" ; shift

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 7063e17..ea33cb0 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -22,7 +22,7 @@ inherit cmake-utils
 # @FUNCTION: mysql_cmake_disable_test
 # @DESCRIPTION:
 # Helper function to disable specific tests.
-mysql_cmake_disable_test() {
+mysql-cmake_disable_test() {
 
 	local rawtestname testname testsuite reason mysql_disable_file
 	rawtestname="${1}" ; shift
@@ -250,6 +250,8 @@ configure_51() {
 # Apply patches to the source code and remove unneeded bundled libs.
 mysql-cmake_src_prepare() {
 
+	debug-print-function ${FUNCNAME} "$@"
+
 	cd "${S}"
 
 	# Apply the patches for this MySQL version
@@ -274,6 +276,8 @@ mysql-cmake_src_prepare() {
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-cmake_src_configure() {
 
+	debug-print-function ${FUNCNAME} "$@"
+
 	mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DMYSQL_DATADIR=/var/lib/mysql
@@ -294,6 +298,7 @@ mysql-cmake_src_configure() {
 		-DINSTALL_SQLBENCHDIR=share/mysql
 		-DINSTALL_SUPPORTFILESDIR=/usr/share/mysql
 		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITHOUT_UNIT_TESTS=1
 	)
 
 	configure_cmake_locale
@@ -323,6 +328,8 @@ mysql-cmake_src_configure() {
 # Compile the mysql code.
 mysql-cmake_src_compile() {
 
+	debug-print-function ${FUNCNAME} "$@"
+
 	cmake-utils_src_compile
 }
 
@@ -331,6 +338,8 @@ mysql-cmake_src_compile() {
 # Install mysql.
 mysql-cmake_src_install() {
 
+	debug-print-function ${FUNCNAME} "$@"
+
 	# Make sure the vars are correctly initialized
 	mysql_init_vars