| 1 |
robbat2 14/07/29 23:06:42 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mysql-5.6.19.ebuild |
| 5 |
Log: |
| 6 |
Bring MySQL 5.6 from the overlay into the tree. Thanks to the great work of Brian Evans <grknight@g.o>. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.674 dev-db/mysql/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.674&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.674&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?r1=1.673&r2=1.674 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v |
| 20 |
retrieving revision 1.673 |
| 21 |
retrieving revision 1.674 |
| 22 |
diff -p -w -b -B -u -u -r1.673 -r1.674 |
| 23 |
--- ChangeLog 29 Jul 2014 03:24:47 -0000 1.673 |
| 24 |
+++ ChangeLog 29 Jul 2014 23:06:42 -0000 1.674 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-db/mysql |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.673 2014/07/29 03:24:47 grknight Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.674 2014/07/29 23:06:42 robbat2 Exp $ |
| 30 |
+ |
| 31 |
+*mysql-5.6.19 (29 Jul 2014) |
| 32 |
+ |
| 33 |
+ 29 Jul 2014; Robin H. Johnson <robbat2@g.o> +mysql-5.6.19.ebuild: |
| 34 |
+ Bring MySQL 5.6 from the overlay into the tree. Thanks to the great work of |
| 35 |
+ Brian Evans <grknight@g.o>. |
| 36 |
|
| 37 |
*mysql-5.5.38-r1 (29 Jul 2014) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-db/mysql/mysql-5.6.19.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.19.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.19.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: mysql-5.6.19.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2014 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.19.ebuild,v 1.1 2014/07/29 23:06:42 robbat2 Exp $ |
| 52 |
|
| 53 |
EAPI="5" |
| 54 |
|
| 55 |
MY_EXTRAS_VER="20140729-2200Z" |
| 56 |
MY_PV="${PV//_alpha_pre/-m}" |
| 57 |
MY_PV="${MY_PV//_/-}" |
| 58 |
|
| 59 |
# Build type |
| 60 |
BUILD="cmake" |
| 61 |
|
| 62 |
inherit toolchain-funcs mysql-v2 |
| 63 |
# only to make repoman happy. it is really set in the eclass |
| 64 |
IUSE="$IUSE" |
| 65 |
|
| 66 |
# Define the mysql-extras source |
| 67 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 68 |
|
| 69 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 70 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 71 |
|
| 72 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
| 73 |
EPATCH_EXCLUDE='' |
| 74 |
|
| 75 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
| 76 |
RDEPEND="${RDEPEND}" |
| 77 |
|
| 78 |
# Please do not add a naive src_unpack to this ebuild |
| 79 |
# If you want to add a single patch, copy the ebuild to an overlay |
| 80 |
# and create your own mysql-extras tarball, looking at 000_index.txt |
| 81 |
|
| 82 |
# Official test instructions: |
| 83 |
# USE='-cluster embedded extraengine perl ssl static-libs community' \ |
| 84 |
# FEATURES='test userpriv -usersandbox' \ |
| 85 |
# ebuild mysql-X.X.XX.ebuild \ |
| 86 |
# digest clean package |
| 87 |
src_test() { |
| 88 |
|
| 89 |
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
| 90 |
local retstatus_unit |
| 91 |
local retstatus_tests |
| 92 |
|
| 93 |
# Bug #213475 - MySQL _will_ object strenously if your machine is named |
| 94 |
# localhost. Also causes weird failures. |
| 95 |
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
| 96 |
|
| 97 |
if ! use "minimal" ; then |
| 98 |
|
| 99 |
if [[ $UID -eq 0 ]]; then |
| 100 |
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
| 101 |
fi |
| 102 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 103 |
|
| 104 |
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 105 |
addpredict /this-dir-does-not-exist/t9.MYI |
| 106 |
|
| 107 |
# Run CTest (test-units) |
| 108 |
cmake-utils_src_test |
| 109 |
retstatus_unit=$? |
| 110 |
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 111 |
|
| 112 |
# Ensure that parallel runs don't die |
| 113 |
export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
| 114 |
|
| 115 |
# create directories because mysqladmin might right out of order |
| 116 |
mkdir -p "${S}"/mysql-test/var-tests{,/log} |
| 117 |
|
| 118 |
# create symlink for the tests to find mysql_tzinfo_to_sql |
| 119 |
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
| 120 |
|
| 121 |
# These are failing in MySQL 5.5/5.6 for now and are believed to be |
| 122 |
# false positives: |
| 123 |
# |
| 124 |
# main.information_schema, binlog.binlog_statement_insert_delayed, |
| 125 |
# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql, |
| 126 |
# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, |
| 127 |
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, |
| 128 |
# mysqld--help-notwin, funcs_1.is_triggers |
| 129 |
# fails due to USE=-latin1 / utf8 default |
| 130 |
# |
| 131 |
# main.mysql_client_test: |
| 132 |
# segfaults at random under Portage only, suspect resource limits. |
| 133 |
# |
| 134 |
# main.mysql_tzinfo_to_sql_symlink |
| 135 |
# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive |
| 136 |
# |
| 137 |
for t in main.mysql_client_test \ |
| 138 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
| 139 |
main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \ |
| 140 |
funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \ |
| 141 |
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \ |
| 142 |
mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink \ |
| 143 |
funcs_1.is_triggers ; do |
| 144 |
mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 145 |
done |
| 146 |
|
| 147 |
# Run mysql tests |
| 148 |
pushd "${TESTDIR}" |
| 149 |
|
| 150 |
# Set file limits higher so tests run |
| 151 |
ulimit -n 3000 |
| 152 |
|
| 153 |
# run mysql-test tests |
| 154 |
perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
| 155 |
--suite-timeout=5000 --parallel=auto |
| 156 |
retstatus_tests=$? |
| 157 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
| 158 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 159 |
|
| 160 |
popd |
| 161 |
|
| 162 |
# Cleanup is important for these testcases. |
| 163 |
pkill -9 -f "${S}/ndb" 2>/dev/null |
| 164 |
pkill -9 -f "${S}/sql" 2>/dev/null |
| 165 |
|
| 166 |
failures="" |
| 167 |
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
| 168 |
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
| 169 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 170 |
|
| 171 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
| 172 |
einfo "Tests successfully completed" |
| 173 |
|
| 174 |
else |
| 175 |
|
| 176 |
einfo "Skipping server tests due to minimal build." |
| 177 |
fi |
| 178 |
} |
Archives