dev-db/mariadb: bump mariadb with the extraengines
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@2241 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
b5b8469e79
commit
c993f2f959
|
|
@ -1,7 +1,10 @@
|
|||
# ChangeLog for dev-db/mysql-mariadb
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
30 May 2010; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
|
||||
bump mariadb with the extraengines
|
||||
|
||||
14 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
mysql-mariadb-5.1.32_beta.ebuild:
|
||||
take patches from git
|
||||
|
|
|
|||
|
|
@ -10,4 +10,5 @@ DIST mysql-storage-sphinx-0.9.9-gentoo-r3.tar.gz 117988 RMD160 b18328ca54f919e3d
|
|||
DIST mysql-storage-spider-2.20-gentoo-r1.tar.gz 176918 RMD160 043ac94be10e77fba1f22ec351b203dc3fd8de74 SHA1 54e36fe9928b7a70105ce124eea59e3fd668042c SHA256 0aee30d205240027c901a79ea5cd10be016c2a9c74a66c25d9a56af97db9362c
|
||||
EBUILD mariadb-5.1.42-r1.ebuild 6921 RMD160 d7ff8a33eee45fbd74948aea9ff9b2c0480cd368 SHA1 affd7cbd325d1a5a9b4079d90666ea37e94e2950 SHA256 463e5efece60c9ef96bc3f8d1d6d1be0bc0355d928612cdb69b10fb95466d158
|
||||
EBUILD mariadb-5.1.44b-r1.ebuild 7212 RMD160 e4c0074869830a9b8386a6a96101096cca462f3d SHA1 73924a9a022ced59f0a3476bb95b39123867a172 SHA256 498c436d00dba1c7db80936239efc201b1225842e9425b8f116beb5683f63e92
|
||||
MISC ChangeLog 314 RMD160 7771d6b85a0564c7e4cb09a93008a133ab73159c SHA1 e8bbed35abe46cb460f98879e5e25e4538f892d5 SHA256 2c9efd4b40d6fec269a698cf3e36e0cfe4764f55a1c65a6ce14065ea1eeb49b2
|
||||
MISC ChangeLog 418 RMD160 a2ea71035cbde95e56564bea8131f98ca7980b05 SHA1 19e38fcdfdaa3ed92943f5ede21a3f92eb2ae84c SHA256 12421169bdbc6645459cfc5f0d3b6b7b20e5939ef334149f2ea805a44744734b
|
||||
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!--
|
||||
$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
|
||||
|
||||
This is the example metadata file.
|
||||
The root element of this file is <pkgmetadata>. Within this element a
|
||||
number of subelements are allowed: herd, maintainer, and
|
||||
longdescription. herd is a required subelement.
|
||||
|
||||
For a full description look at:
|
||||
http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
|
||||
|
||||
|
||||
Before committing, please remove the comments from this file. They are
|
||||
not relevant for general metadata.xml files.
|
||||
-->
|
||||
<pkgmetadata>
|
||||
<herd>no-herd</herd>
|
||||
<maintainer>
|
||||
<email>@gentoo.org</email>
|
||||
<!-- <description>Description of the maintainership</description> -->
|
||||
</maintainer>
|
||||
<!-- <longdescription>Long description of the package</longdescription> -->
|
||||
<!--
|
||||
<use>
|
||||
<flag name='flag'>Description of how USE='flag' affects this package</flag>
|
||||
<flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
|
||||
package</flag>
|
||||
<flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
|
||||
Requires an installed dictionary from <cat>app-dicts</cat></flag>
|
||||
</use>
|
||||
-->
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.21_beta.ebuild,v 1.3 2008/11/14 09:43:04 robbat2 Exp $
|
||||
|
||||
MY_EXTRAS_VER="live"
|
||||
#SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
|
||||
#PBXT_VERSION="0.9.8-beta"
|
||||
|
||||
inherit mysql
|
||||
# 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
|
||||
|
||||
src_test() {
|
||||
make check || die "make check failed"
|
||||
if ! use "minimal" ; then
|
||||
cd "${S}/mysql-test"
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
local retstatus
|
||||
local t
|
||||
local testopts="--force"
|
||||
|
||||
addpredict /this-dir-does-not-exist/t9.MYI
|
||||
|
||||
# mysqladmin start before dir creation
|
||||
mkdir "${S}"/mysql-test/var{,/log}
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
|
||||
# sandbox make ndbd zombie
|
||||
#X#hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
|
||||
|
||||
#X#if [[ ${UID} -eq 0 ]] ; then
|
||||
#X# einfo "Disabling IM tests due to failure as root"
|
||||
#X# mysql_disable_test "im_cmd_line" "fail as root"
|
||||
#X# mysql_disable_test "im_daemon_life_cycle" "fail as root"
|
||||
#X# mysql_disable_test "im_instance_conf" "fail as root"
|
||||
#X# mysql_disable_test "im_life_cycle" "fail as root"
|
||||
#X# mysql_disable_test "im_options" "fail as root"
|
||||
#X# mysql_disable_test "im_utils" "fail as root"
|
||||
#X# mysql_disable_test "trigger" "fail as root"
|
||||
#X#fi
|
||||
|
||||
#use "extraengine" && mysql_disable_test "federated" "fail with extraengine"
|
||||
|
||||
#mysql_disable_test "view" "Already fixed: fail because now we are in year 2007"
|
||||
|
||||
# from Makefile.am:
|
||||
retstatus=1
|
||||
./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \
|
||||
&& ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \
|
||||
&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \
|
||||
&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \
|
||||
&& retstatus=0
|
||||
|
||||
# Just to be sure ;)
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
[[ $retstatus -eq 0 ]] || die "make test failed"
|
||||
else
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue