summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2010-02-01 19:16:06 +0000
committerHanno Böck <hanno@gentoo.org>2010-02-01 19:16:06 +0000
commitba52042ed011c1270aca5361145205046ab6b644 (patch)
tree94b4d08382e89b261617873664737ef8efd92862 /eclass
parentAdd die() when dobin fails. Use mv again instead of doins to preserve filenam... (diff)
downloadgentoo-2-ba52042ed011c1270aca5361145205046ab6b644.tar.gz
gentoo-2-ba52042ed011c1270aca5361145205046ab6b644.tar.bz2
gentoo-2-ba52042ed011c1270aca5361145205046ab6b644.zip
adjust mysql.eclass to support 5.4/5.5
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 50c152075638..554f6dd595a5 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.127 2010/02/01 01:07:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.128 2010/02/01 19:16:06 hanno Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -85,7 +85,7 @@ elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.4}" != "${PV}" ]; then
+elif [ "${PV#5.4}" != "${PV}" ] || [ "${PV#5.4}" != "${PV}" ]; then
MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
@@ -504,7 +504,7 @@ configure_51() {
myconf="${myconf} --with-ndb-binlog"
fi
- if mysql_version_is_at_least "5.2" ; then
+ if [ -e "${S}/storage/falcon" ] ; then
plugins="${plugins},falcon"
fi