/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.66 Revision 1.120
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.66 2007/01/08 20:38:58 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.120 2009/12/09 18:46:53 robbat2 Exp $
4# kate: encoding utf-8; eol unix;
5# kate: indent-width 4; mixedindent off; remove-trailing-space on; space-indent off;
6# kate: word-wrap-column 80; word-wrap off;
7 4
5# @ECLASS: mysql.eclass
6# @MAINTAINER:
8# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
9# Maintainer: Luca Longinotti <chtekk@gentoo.org> 9# - Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds
14# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks.
10 17
11# Note that MYSQL_VERSION_ID must be empty !!!
12
13ECLASS="mysql"
14INHERITED="$INHERITED $ECLASS"
15WANT_AUTOCONF="latest" 18WANT_AUTOCONF="latest"
16WANT_AUTOMAKE="latest" 19WANT_AUTOMAKE="latest"
20
17inherit eutils flag-o-matic gnuconfig autotools mysql_fx 21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
22
23case "${EAPI:-0}" in
24 2)
25 EXPORT_FUNCTIONS pkg_setup \
26 src_unpack src_prepare \
27 src_configure src_compile \
28 src_install \
29 pkg_preinst pkg_postinst \
30 pkg_config pkg_postrm
31 IUSE_DEFAULT_ON='+'
32 ;;
33 0 | 1)
34 EXPORT_FUNCTIONS pkg_setup \
35 src_unpack \
36 src_compile \
37 src_install \
38 pkg_preinst pkg_postinst \
39 pkg_config pkg_postrm
40 ;;
41 *)
42 die "Unsupported EAPI: ${EAPI}" ;;
43esac
18 44
19# Shorten the path because the socket path length must be shorter than 107 chars 45# Shorten the path because the socket path length must be shorter than 107 chars
20# and we will run a mysql server during test phase 46# and we will run a mysql server during test phase
21S="${WORKDIR}/mysql" 47S="${WORKDIR}/mysql"
22 48
23[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 49[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
24 50if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
25if [[ ${PR#r} -lt 60 ]] ; then 51 EGIT_PROJECT=mysql-extras
26 IS_BITKEEPER=0 52 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
27elif [[ ${PR#r} -lt 90 ]] ; then 53 inherit git
28 IS_BITKEEPER=60
29else
30 IS_BITKEEPER=90
31fi 54fi
32 55
56# @ECLASS-VARIABLE: MYSQL_VERSION_ID
57# @DESCRIPTION:
33# MYSQL_VERSION_ID will be: 58# MYSQL_VERSION_ID will be:
34# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
35# This is an important part, because many of the choices the MySQL ebuild will do 60# This is an important part, because many of the choices the MySQL ebuild will do
36# depend on this variable. 61# depend on this variable.
37# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 62# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
63# We also strip off upstream's trailing letter that they use to respin tarballs
64
38MYSQL_VERSION_ID="" 65MYSQL_VERSION_ID=""
66tpv="${PV%[a-z]}"
39tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 67tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
40for vatom in 0 1 2 3 ; do 68for vatom in 0 1 2 3 ; do
41 # pad to length 2 69 # pad to length 2
42 tpv[${vatom}]="00${tpv[${vatom}]}" 70 tpv[${vatom}]="00${tpv[${vatom}]}"
43 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 71 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
44done 72done
45# strip leading "0" (otherwise it's considered an octal number by BASH) 73# strip leading "0" (otherwise it's considered an octal number by BASH)
46MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 74MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
47 75
76# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
77# @DESCRIPTION:
78# Specifiy if community features are available. Possible values are 1 (yes)
79# and 0 (no).
80# Community features are available in mysql-community
81# AND in the re-merged mysql-5.0.82 and newer
82if [ "${PN}" == "mysql-community" ]; then
83 MYSQL_COMMUNITY_FEATURES=1
84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
85 MYSQL_COMMUNITY_FEATURES=1
86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
87 MYSQL_COMMUNITY_FEATURES=1
88elif [ "${PV#5.4}" != "${PV}" ]; then
89 MYSQL_COMMUNITY_FEATURES=1
90else
91 MYSQL_COMMUNITY_FEATURES=0
92fi
93
94# @ECLASS-VARIABLE: XTRADB_VER
95# @DESCRIPTION:
96# Version of the XTRADB storage engine
97XTRADB_VER="${XTRADB_VER}"
98
99# @ECLASS-VARIABLE: PERCONA_VER
100# @DESCRIPTION:
101# Designation by PERCONA for a MySQL version to apply an XTRADB release
102PERCONA_VER="${PERCONA_VER}"
103
48# Be warned, *DEPEND are version-dependant 104# Be warned, *DEPEND are version-dependant
105# These are used for both runtime and compiletime
49DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 106DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
50 userland_GNU? ( sys-process/procps ) 107 userland_GNU? ( sys-process/procps )
51 >=sys-apps/sed-4 108 >=sys-apps/sed-4
52 >=sys-apps/texinfo-4.7-r1 109 >=sys-apps/texinfo-4.7-r1
53 >=sys-libs/readline-4.1 110 >=sys-libs/readline-4.1
54 >=sys-libs/zlib-1.2.3 111 >=sys-libs/zlib-1.2.3"
55 "
56 112
57# having different flavours at the same time is not a good idea 113# Having different flavours at the same time is not a good idea
58for i in "" "-community" "-slotted" ; do 114for i in "" "-community" ; do
59 [[ "${i}" == ${PN#mysql} ]] || 115 [[ "${i}" == ${PN#mysql} ]] ||
60 DEPEND="${DEPEND} !dev-db/mysql${i}" 116 DEPEND="${DEPEND} !dev-db/mysql${i}"
61done 117done
62 118
119RDEPEND="${DEPEND}
120 !minimal? ( dev-db/mysql-init-scripts )
121 selinux? ( sec-policy/selinux-mysql )"
122
123# compile-time-only
63mysql_version_is_at_least "5.1" \ 124mysql_version_is_at_least "5.1" \
64|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 125|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
65 126
127# compile-time-only
128mysql_version_is_at_least "5.1.12" \
129&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
130
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 131# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 132PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 133
69if mysql_version_is_at_least "5.1.12" ; then 134# For other stuff to bring us in
70 DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 135PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
136
137# Work out the default SERVER_URI correctly
138if [ -z "${SERVER_URI}" ]; then
139 # The community build is on the mirrors
140 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
141 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
142 # The (old) enterprise source is on the primary site only
143 elif [ "${PN}" == "mysql" ]; then
144 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
145 fi
71fi 146fi
72 147
73# BitKeeper dependency, compile-time only
74[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
75
76if [[ ${PN} == "mysql-slotted" ]] ; then
77 DEPEND="${DEPEND} app-admin/eselect-mysql"
78fi
79
80if [[ ${PN} == "mysql-slotted" ]] ; then
81 SLOT=""
82 tpv=( ${PV//[-._]/ } )
83 for vatom in 0 1 2 ; do
84 SLOT="${SLOT}${tpv[${vatom}]}_"
85 done
86 #finally SLOT=5_0_24
87 SLOT=${SLOT:0:${#SLOT}-1}
88else
89 SLOT="0"
90fi
91
92# Define correct SRC_URIs 148# Define correct SRC_URIs
93SRC_URI=" 149SRC_URI="${SERVER_URI}"
94${SERVER_URI} 150
151[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
152 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
95http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 153 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
96" 154PBXT_SRC_URI="mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz"
97mysql_version_is_at_least "5.1.12" \ 155mysql_version_is_at_least "5.1.12" \
98&& [[ -n "${PBXT_VERSION}" ]] \ 156&& [[ -n "${PBXT_VERSION}" ]] \
99&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 157&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URIPBXT_SRC_URI} )"
158
159# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
160XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz"
161mysql_version_is_at_least "5.1.26" \
162&& [[ -n ${XTRADB_VER} && -n ${PERCONA_VER} ]] \
163&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
100 164
101DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 165DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
102HOMEPAGE="http://www.mysql.com/" 166HOMEPAGE="http://www.mysql.com/"
103LICENSE="GPL-2" 167LICENSE="GPL-2"
168SLOT="0"
104IUSE="big-tables debug embedded minimal perl selinux ssl static" 169IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
105RESTRICT="confcache"
106 170
107mysql_version_is_at_least "4.1" \ 171mysql_version_is_at_least "4.1" \
108&& IUSE="${IUSE} latin1" 172&& IUSE="${IUSE} latin1"
109 173
110mysql_version_is_at_least "4.1.3" \ 174mysql_version_is_at_least "4.1.3" \
115 179
116mysql_version_is_at_least "5.0.18" \ 180mysql_version_is_at_least "5.0.18" \
117&& IUSE="${IUSE} max-idx-128" 181&& IUSE="${IUSE} max-idx-128"
118 182
119mysql_version_is_at_least "5.1" \ 183mysql_version_is_at_least "5.1" \
120&& IUSE="${IUSE} innodb"
121
122mysql_version_is_at_least "5.1" \
123|| IUSE="${IUSE} berkdb" 184|| IUSE="${IUSE} berkdb"
124 185
125mysql_version_is_at_least "5.1.12" \ 186mysql_version_is_at_least "5.1.12" \
126&& IUSE="${IUSE} pbxt" 187&& IUSE="${IUSE} pbxt"
127 188
128RDEPEND="${DEPEND} 189mysql_version_is_at_least "5.1.26" \
129!minimal? ( sys-apps/mysql ) 190&& IUSE="${IUSE} xtradb"
130selinux? ( sec-policy/selinux-mysql )
131"
132 191
133EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 192[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
134 pkg_postinst pkg_config pkg_postrm 193&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
135 194
136# 195#
137# HELPER FUNCTIONS: 196# HELPER FUNCTIONS:
138# 197#
139 198
140bitkeeper_fetch() { 199# @FUNCTION: mysql_disable_test
141 200# @DESCRIPTION:
142 local reposuf 201# Helper function to disable specific tests.
143 if [[ -z "${1}" ]] ; then
144 local tpv
145 tpv=( ${PV//[-._]/ } )
146 reposuf="mysql-${tpv[0]}.${tpv[1]}"
147 else
148 reposuf="${1}"
149 fi
150 einfo "using \"${reposuf}\" repository."
151 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
152 ## -- ebk_store_dir: bitkeeper sources store directory
153 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
154 ## -- ebk_fetch_cmd: bitkeeper fetch command
155 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
156 # hint: does not work
157 local ebk_fetch_cmd="sfioball"
158 ## -- ebk_update_cmd: bitkeeper update command
159 local ebk_update_cmd="update"
160
161 #addread "/etc/bitkeeper"
162 addwrite "${ebk_store_dir}"
163
164 if [[ ! -d "${ebk_store_dir}" ]]; then
165 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
166 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
167 fi
168
169 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
170
171 local wc_path=${reposuf}
172
173 if [[ ! -d "${wc_path}" ]]; then
174 local options="-r+"
175 # first check out
176 einfo "bitkeeper check out start -->"
177 elog " repository: ${repo_uri}"
178 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
179 || die "${EBK}: can't fetch from ${repo_uri}."
180 else
181 if [[ ! -d "${wc_path}/BK" ]]; then
182 popd
183 die "Look like ${wc_path} is not a bitkeeper path."
184 fi
185
186 # update working copy
187 einfo "bitkeeper update start -->"
188 elog " repository: ${repo_uri}"
189
190 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
191 || die "BK: can't update from ${repo_uri} to ${wc_path}."
192 fi
193
194 einfo " working copy: ${wc_path}"
195 cd "${wc_path}"
196 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
197
198 echo
199 popd
200
201}
202
203mysql_disable_test() { 202mysql_disable_test() {
204 local testname="${1}" ; shift 203 local testname="${1}" ; shift
205 local reason="${@}" 204 local reason="${@}"
206 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 205 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
207 echo ${testname} : ${reason} >> "${mysql_disable_file}" 206 echo ${testname} : ${reason} >> "${mysql_disable_file}"
208 ewarn "test \"${testname}\" disabled because: \"${reason}\"" 207 ewarn "test '${testname}' disabled: '${reason}'"
209} 208}
210 209
210# @FUNCTION: mysql_init_vars
211# @DESCRIPTION:
211# void mysql_init_vars() 212# void mysql_init_vars()
212#
213# Initialize global variables 213# Initialize global variables
214# 2005-11-19 <vivo@gentoo.org> 214# 2005-11-19 <vivo@gentoo.org>
215
216mysql_init_vars() { 215mysql_init_vars() {
217 if [[ ${SLOT} == "0" ]] ; then
218 MY_SUFFIX=""
219 else
220 MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
221 fi
222 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"} 216 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
223 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"} 217 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
224 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"} 218 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
225 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"} 219 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
226 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"} 220 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
227 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"} 221 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
228 222
229 if [[ -z "${DATADIR}" ]] ; then 223 if [[ -z "${MY_DATADIR}" ]] ; then
230 DATADIR="" 224 MY_DATADIR=""
231 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 225 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
232 DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null \ 226 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
233 | sed -ne '/datadir/s|^--datadir=||p' \ 227 | sed -ne '/datadir/s|^--datadir=||p' \
234 | tail -n1` 228 | tail -n1`
235 if [[ -z "${DATADIR}" ]] ; then 229 if [[ -z "${MY_DATADIR}" ]] ; then
236 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 230 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
237 | sed -e 's/.*=\s*//'` 231 | sed -e 's/.*=\s*//' \
232 | tail -n1`
238 fi 233 fi
239 fi 234 fi
240 if [[ -z "${DATADIR}" ]] ; then 235 if [[ -z "${MY_DATADIR}" ]] ; then
241 DATADIR="${MY_LOCALSTATEDIR}" 236 MY_DATADIR="${MY_LOCALSTATEDIR}"
242 einfo "Using default DATADIR" 237 einfo "Using default MY_DATADIR"
243 fi 238 fi
244 elog "MySQL DATADIR is ${DATADIR}" 239 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
245 240
246 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 241 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
247 if [[ -e "${DATADIR}" ]] ; then 242 if [[ -e "${MY_DATADIR}" ]] ; then
248 elog "Previous datadir found, it's YOUR job to change" 243 # If you get this and you're wondering about it, see bug #207636
249 elog "ownership and take care of it" 244 elog "MySQL datadir found in ${MY_DATADIR}"
245 elog "A new one will not be created."
250 PREVIOUS_DATADIR="yes" 246 PREVIOUS_DATADIR="yes"
251 else 247 else
252 PREVIOUS_DATADIR="no" 248 PREVIOUS_DATADIR="no"
253 fi 249 fi
254 export PREVIOUS_DATADIR 250 export PREVIOUS_DATADIR
255 fi 251 fi
252 else
253 if [[ ${EBUILD_PHASE} == "config" ]]; then
254 local new_MY_DATADIR
255 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
256 | sed -ne '/datadir/s|^--datadir=||p' \
257 | tail -n1`
258
259 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
260 ewarn "MySQL MY_DATADIR has changed"
261 ewarn "from ${MY_DATADIR}"
262 ewarn "to ${new_MY_DATADIR}"
263 MY_DATADIR="${new_MY_DATADIR}"
264 fi
265 fi
256 fi 266 fi
257 267
258 MY_SOURCEDIR=${SERVER_URI##*/} 268 MY_SOURCEDIR=${SERVER_URI##*/}
259 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 269 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
260 270
261 export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR 271 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
262 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 272 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
263 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 273 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
264} 274}
265 275
266configure_minimal() { 276configure_minimal() {
267 # These are things we exclude from a minimal build, please 277 # These are things we exclude from a minimal build, please
268 # note that the server actually does get built and installed, 278 # note that the server actually does get built and installed,
269 # but we then delete it before packaging. 279 # but we then delete it before packaging.
270 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 280 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
271 281
272 for i in ${minimal_exclude_list} ; do 282 for i in ${minimal_exclude_list} ; do
273 myconf="${myconf} --without-${i}" 283 myconf="${myconf} --without-${i}"
274 done 284 done
275 myconf="${myconf} --with-extra-charsets=none" 285 myconf="${myconf} --with-extra-charsets=none"
276 myconf="${myconf} --enable-local-infile" 286 myconf="${myconf} --enable-local-infile"
277 287
278 if useq "static" ; then 288 if use static ; then
279 myconf="${myconf} --with-client-ldflags=-all-static" 289 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 290 myconf="${myconf} --disable-shared --with-pic"
281 else 291 else
282 myconf="${myconf} --enable-shared --enable-static" 292 myconf="${myconf} --enable-shared --enable-static"
283 fi 293 fi
284 294
285 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 295 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
286 myconf="${myconf} --with-charset=utf8" 296 myconf="${myconf} --with-charset=utf8"
287 myconf="${myconf} --with-collation=utf8_general_ci" 297 myconf="${myconf} --with-collation=utf8_general_ci"
288 else 298 else
289 myconf="${myconf} --with-charset=latin1" 299 myconf="${myconf} --with-charset=latin1"
290 myconf="${myconf} --with-collation=latin1_swedish_ci" 300 myconf="${myconf} --with-collation=latin1_swedish_ci"
298 myconf="${myconf} --with-mysqld-user=mysql" 308 myconf="${myconf} --with-mysqld-user=mysql"
299 myconf="${myconf} --with-server" 309 myconf="${myconf} --with-server"
300 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 310 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
301 myconf="${myconf} --without-libwrap" 311 myconf="${myconf} --without-libwrap"
302 312
303 if useq "static" ; then 313 if use static ; then
304 myconf="${myconf} --with-mysqld-ldflags=-all-static" 314 myconf="${myconf} --with-mysqld-ldflags=-all-static"
305 myconf="${myconf} --with-client-ldflags=-all-static" 315 myconf="${myconf} --with-client-ldflags=-all-static"
306 myconf="${myconf} --disable-shared" 316 myconf="${myconf} --disable-shared --with-pic"
307 else 317 else
308 myconf="${myconf} --enable-shared --enable-static" 318 myconf="${myconf} --enable-shared --enable-static"
309 fi 319 fi
310 320
311 if useq "debug" ; then 321 if use debug ; then
312 myconf="${myconf} --with-debug=full" 322 myconf="${myconf} --with-debug=full"
313 else 323 else
314 myconf="${myconf} --without-debug" 324 myconf="${myconf} --without-debug"
315 mysql_version_is_at_least "4.1.3" \ 325 mysql_version_is_at_least "4.1.3" \
316 && useq "cluster" \ 326 && use cluster \
317 && myconf="${myconf} --without-ndb-debug" 327 && myconf="${myconf} --without-ndb-debug"
318 fi 328 fi
319 329
330 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
331 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
332 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
333 ewarn "You MUST file bugs without these variables set."
334 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
335 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
320 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then 336 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
321 myconf="${myconf} --with-charset=utf8" 337 myconf="${myconf} --with-charset=utf8"
322 myconf="${myconf} --with-collation=utf8_general_ci" 338 myconf="${myconf} --with-collation=utf8_general_ci"
323 else 339 else
324 myconf="${myconf} --with-charset=latin1" 340 myconf="${myconf} --with-charset=latin1"
325 myconf="${myconf} --with-collation=latin1_swedish_ci" 341 myconf="${myconf} --with-collation=latin1_swedish_ci"
326 fi 342 fi
327 343
328 if useq "embedded" ; then 344 if use embedded ; then
329 myconf="${myconf} --with-embedded-privilege-control" 345 myconf="${myconf} --with-embedded-privilege-control"
330 myconf="${myconf} --with-embedded-server" 346 myconf="${myconf} --with-embedded-server"
331 else 347 else
332 myconf="${myconf} --without-embedded-privilege-control" 348 myconf="${myconf} --without-embedded-privilege-control"
333 myconf="${myconf} --without-embedded-server" 349 myconf="${myconf} --without-embedded-server"
341 myconf="${myconf} --with-extra-tools" 357 myconf="${myconf} --with-extra-tools"
342 myconf="${myconf} --with-innodb" 358 myconf="${myconf} --with-innodb"
343 myconf="${myconf} --without-readline" 359 myconf="${myconf} --without-readline"
344 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 360 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
345 361
346 if useq "ssl" ; then
347 # --with-vio is not needed anymore, it's on by default and 362 # --with-vio is not needed anymore, it's on by default and
348 # has been removed from configure 363 # has been removed from configure
364 if use ssl ; then
349 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 365 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
350 fi 366 fi
351 367
352 if mysql_version_is_at_least "5.1.11" ; then 368 if mysql_version_is_at_least "5.1.11" ; then
353 myconf="${myconf} $(use_with ssl)" 369 myconf="${myconf} $(use_with ssl)"
354 else 370 else
355 myconf="${myconf} $(use_with ssl openssl)" 371 myconf="${myconf} $(use_with ssl openssl)"
356 fi 372 fi
357 373
374 if mysql_version_is_at_least "5.0.60" ; then
375 if use berkdb ; then
376 elog "Berkeley DB support was disabled due to build failures"
377 elog "on multiple arches, go to a version earlier than 5.0.60"
378 elog "if you want it again. Gentoo bug #224067."
379 fi
380 myconf="${myconf} --without-berkeley-db"
381 elif use berkdb ; then
358 # The following fix is due to a bug with bdb on SPARC's. See: 382 # The following fix is due to a bug with bdb on SPARC's. See:
359 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 383 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
360 # It comes down to non-64-bit safety problems. 384 # It comes down to non-64-bit safety problems.
361 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then 385 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
362 elog "Berkeley DB support was disabled due to incompatible arch" 386 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
387 myconf="${myconf} --without-berkeley-db"
388 else
389 myconf="${myconf} --with-berkeley-db=./bdb"
390 fi
391 else
363 myconf="${myconf} --without-berkeley-db" 392 myconf="${myconf} --without-berkeley-db"
364 else
365 if useq "berkdb" ; then
366 myconf="${myconf} --with-berkeley-db=./bdb"
367 else
368 myconf="${myconf} --without-berkeley-db"
369 fi
370 fi 393 fi
371 394
372 if mysql_version_is_at_least "4.1.3" ; then 395 if mysql_version_is_at_least "4.1.3" ; then
373 myconf="${myconf} --with-geometry" 396 myconf="${myconf} --with-geometry"
374 myconf="${myconf} $(use_with cluster ndbcluster)" 397 myconf="${myconf} $(use_with cluster ndbcluster)"
375 fi 398 fi
376 399
377 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then 400 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
378 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 401 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
379 myconf="${myconf} --with-archive-storage-engine" 402 myconf="${myconf} --with-archive-storage-engine"
380 403
381 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 404 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
382 myconf="${myconf} --with-csv-storage-engine" 405 myconf="${myconf} --with-csv-storage-engine"
392 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 415 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
393 myconf="${myconf} --with-federated-storage-engine" 416 myconf="${myconf} --with-federated-storage-engine"
394 fi 417 fi
395 fi 418 fi
396 419
420 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
421 myconf="${myconf} `use_enable community community-features`"
422 if use community; then
423 myconf="${myconf} `use_enable profiling`"
424 else
425 myconf="${myconf} --disable-profiling"
426 fi
427 fi
428
397 mysql_version_is_at_least "5.0.18" \ 429 mysql_version_is_at_least "5.0.18" \
398 && useq "max-idx-128" \ 430 && use max-idx-128 \
399 && myconf="${myconf} --with-max-indexes=128" 431 && myconf="${myconf} --with-max-indexes=128"
400} 432}
401 433
402configure_51() { 434configure_51() {
403 # TODO: !!!! readd --without-readline 435 # TODO: !!!! readd --without-readline
408 myconf="${myconf} --with-geometry" 440 myconf="${myconf} --with-geometry"
409 myconf="${myconf} --with-readline" 441 myconf="${myconf} --with-readline"
410 myconf="${myconf} --with-row-based-replication" 442 myconf="${myconf} --with-row-based-replication"
411 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 443 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
412 myconf="${myconf} --without-pstack" 444 myconf="${myconf} --without-pstack"
413 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 445 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
414 446
415 # 5.1 introduces a new way to manage storage engines (plugins) 447 # 5.1 introduces a new way to manage storage engines (plugins)
416 # like configuration=none 448 # like configuration=none
417 local plugins="csv,myisam,myisammrg,heap" 449 local plugins="csv,myisam,myisammrg,heap"
418 if useq "extraengine" ; then 450 if use extraengine ; then
419 # like configuration=max-no-ndb, archive and example removed in 5.1.11 451 # like configuration=max-no-ndb, archive and example removed in 5.1.11
420 plugins="${plugins},archive,blackhole,example,federated,partition" 452 plugins="${plugins},archive,blackhole,example,federated,partition"
421 453
422 elog "Before using the Federated storage engine, please be sure to read" 454 elog "Before using the Federated storage engine, please be sure to read"
423 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 455 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
424 fi 456 fi
425 457
426 if useq "innodb" ; then 458 # Upstream specifically requests that InnoDB always be built.
427 plugins="${plugins},innobase" 459 plugins="${plugins},innobase"
428 fi
429 460
430 # like configuration=max-no-ndb 461 # like configuration=max-no-ndb
431 if useq "cluster" ; then 462 if use cluster ; then
432 plugins="${plugins},ndbcluster" 463 plugins="${plugins},ndbcluster"
433 myconf="${myconf} --with-ndb-binlog" 464 myconf="${myconf} --with-ndb-binlog"
434 fi 465 fi
435 466
436 if mysql_version_is_at_least "5.2" ; then 467 if mysql_version_is_at_least "5.2" ; then
438 fi 469 fi
439 470
440 myconf="${myconf} --with-plugins=${plugins}" 471 myconf="${myconf} --with-plugins=${plugins}"
441} 472}
442 473
443pbxt_src_compile() { 474pbxt_src_configure() {
444 mysql_init_vars 475 mysql_init_vars
445 476
446 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 477 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
447 478
448 einfo "Reconfiguring dir '${PWD}'" 479 einfo "Reconfiguring dir '${PWD}'"
449 AT_GNUCONF_UPDATE="yes" eautoreconf 480 AT_GNUCONF_UPDATE="yes" eautoreconf
450 481
451 local myconf 482 local myconf=""
452 myconf="${myconf} --with-mysql=${S}"
453 mkdir -p ${T}/lib
454 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 483 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
455 useq "debug" && myconf="${myconf} --with-debug=full" 484 use debug && myconf="${myconf} --with-debug=full"
456 # TODO is safe/needed to use econf here ? 485 # TODO: is it safe/needed to use econf here ?
457 ./configure ${myconf} || die "problem configuring pbxt storage engine" 486 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
487}
488
489pbxt_src_compile() {
490 # Be backwards compatible for now
491 if [[ $EAPI != 2 ]]; then
492 pbxt_src_configure
493 fi
458 # TODO is safe/needed to use emake here ? 494 # TODO: is it safe/needed to use emake here ?
459 make || die "problem making pbxt storage engine (${myconf})" 495 make || die "Problem making PBXT storage engine (${myconf})"
460 496
461 popd 497 popd
462 # TODO: modify test suite 498 # TODO: modify test suite for PBXT
463} 499}
464 500
465pbxt_src_install() { 501pbxt_src_install() {
466 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 502 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
467 make install || die "failed pbxt install" 503 make install || die "Failed to install PBXT"
468 popd 504 popd
469} 505}
470 506
471# 507#
472# EBUILD FUNCTIONS 508# EBUILD FUNCTIONS
473# 509#
474 510# @FUNCTION: mysql_pkg_setup
511# @DESCRIPTION:
512# Perform some basic tests and tasks during pkg_setup phase:
513# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
514# check for conflicting use flags
515# create new user and group for mysql
516# warn about deprecated features
475mysql_pkg_setup() { 517mysql_pkg_setup() {
476 enewgroup mysql 60 || die "problem adding 'mysql' group" 518 if hasq test ${FEATURES} ; then
477 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 519 if ! use minimal ; then
520 if [[ $UID -eq 0 ]]; then
521 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
522 fi
523 fi
524 fi
478 525
479 # Check for USE flag problems in pkg_setup 526 # Check for USE flag problems in pkg_setup
480 if useq "static" && useq "ssl" ; then 527 if use static && use ssl ; then
481 eerror "MySQL does not support being built statically with SSL support enabled!" 528 eerror "MySQL does not support being built statically with SSL support enabled!"
482 die "MySQL does not support being built statically with SSL support enabled!" 529 die "MySQL does not support being built statically with SSL support enabled!"
483 fi 530 fi
484 531
485 if ! mysql_version_is_at_least "5.0" \ 532 if ! mysql_version_is_at_least "5.0" \
486 && useq "raid" \ 533 && use raid \
487 && useq "static" ; then 534 && use static ; then
488 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 535 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
489 eerror "with RAID support enabled." 536 eerror "with RAID support enabled."
490 die "USE flags 'raid' and 'static' conflict!" 537 die "USE flags 'raid' and 'static' conflict!"
491 fi 538 fi
492 539
493 if mysql_version_is_at_least "4.1.3" \ 540 if mysql_version_is_at_least "4.1.3" \
494 && ( useq "cluster" || useq "extraengine" ) \ 541 && ( use cluster || use extraengine ) \
495 && useq "minimal" ; then 542 && use minimal ; then
496 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 543 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
497 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 544 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
498 fi 545 fi
499 546
547 # This should come after all of the die statements
548 enewgroup mysql 60 || die "problem adding 'mysql' group"
549 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
550
500 mysql_check_version_range "4.0 to 5.0.99.99" \ 551 mysql_check_version_range "4.0 to 5.0.99.99" \
501 && useq "berkdb" \ 552 && use berkdb \
502 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 553 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
503} 554}
504 555
556# @FUNCTION: mysql_src_unpack
557# @DESCRIPTION:
558# Unpack the source code and call mysql_src_prepare for EAPI < 2.
505mysql_src_unpack() { 559mysql_src_unpack() {
506 # Initialize the proper variables first 560 # Initialize the proper variables first
507 mysql_init_vars 561 mysql_init_vars
508 562
509 unpack ${A} 563 unpack ${A}
510 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 564 # Grab the patches
511 if mysql_check_version_range "5.1 to 5.1.99" ; then 565 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
512 bitkeeper_fetch "mysql-5.1-ndb" 566
513 elif mysql_check_version_range "5.2.0 to 5.2.99" ; then
514 bitkeeper_fetch "mysql-5.2-falcon"
515 else
516 bitkeeper_fetch
517 fi
518 cd "${S}"
519 einfo "running upstream autorun on bk sources"
520 BUILD/autorun.sh
521 else
522 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 567 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
568
569 # Be backwards compatible for now
570 case ${EAPI:-0} in
571 2) : ;;
572 0 | 1) mysql_src_prepare ;;
573 esac
574}
575
576# @FUNCTION: mysql_src_prepare
577# @DESCRIPTION:
578# Apply patches to the source code and remove unneeded bundled libs.
579mysql_src_prepare() {
523 cd "${S}" 580 cd "${S}"
524 fi
525 581
526 # Apply the patches for this MySQL version 582 # Apply the patches for this MySQL version
527 EPATCH_SUFFIX="patch" 583 EPATCH_SUFFIX="patch"
528 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 584 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
585 # Clean out old items
586 rm -f "${EPATCH_SOURCE}"/*
587 # Now link in right patches
529 mysql_mv_patches 588 mysql_mv_patches
530 epatch || die "failed to apply all patches" 589 # And apply
590 epatch
531 591
532 # Additional checks, remove bundled zlib 592 # Additional checks, remove bundled zlib
533 rm -f "${S}/zlib/"*.[ch] 593 rm -f "${S}/zlib/"*.[ch]
534 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 594 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
535 rm -f "scripts/mysqlbug" 595 rm -f "scripts/mysqlbug"
550 610
551 local rebuilddirlist d 611 local rebuilddirlist d
552 612
553 if mysql_version_is_at_least "5.1.12" ; then 613 if mysql_version_is_at_least "5.1.12" ; then
554 rebuilddirlist="." 614 rebuilddirlist="."
555 # TODO IMPO! Check this with a cmake expert 615 # TODO: check this with a cmake expert
556 useq "innodb" \
557 && cmake \ 616 cmake \
558 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 617 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
559 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 618 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
560 "storage/innobase" 619 "storage/innobase"
561 else 620 else
562 rebuilddirlist=". innobase" 621 rebuilddirlist=". innobase"
563 fi 622 fi
564 623
568 AT_GNUCONF_UPDATE="yes" eautoreconf 627 AT_GNUCONF_UPDATE="yes" eautoreconf
569 popd &>/dev/null 628 popd &>/dev/null
570 done 629 done
571 630
572 if mysql_check_version_range "4.1 to 5.0.99.99" \ 631 if mysql_check_version_range "4.1 to 5.0.99.99" \
573 && useq "berkdb" ; then 632 && use berkdb ; then
574 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 633 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
634 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
635 || die "Could not copy libtool.m4 to bdb/dist/"
636 #These files exist only with libtool-2*, and need to be included.
637 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
638 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
639 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
640 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
641 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
642 fi
575 pushd "bdb/dist" \ 643 pushd "bdb/dist" &>/dev/null
576 && sh s_all \ 644 sh s_all \
577 || die "Failed bdb reconfigure" \ 645 || die "Failed bdb reconfigure"
578 &>/dev/null
579 popd &>/dev/null 646 popd &>/dev/null
580 fi 647 fi
581} 648}
582 649
650# @FUNCTION: mysql_src_configure
651# @DESCRIPTION:
652# Configure mysql to build the code for Gentoo respecting the use flags.
583mysql_src_compile() { 653mysql_src_configure() {
584 # Make sure the vars are correctly initialized 654 # Make sure the vars are correctly initialized
585 mysql_init_vars 655 mysql_init_vars
586 656
587 # $myconf is modified by the configure_* functions 657 # $myconf is modified by the configure_* functions
588 local myconf="" 658 local myconf=""
589 659
590 if useq "minimal" ; then 660 if use minimal ; then
591 configure_minimal 661 configure_minimal
592 else 662 else
593 configure_common 663 configure_common
594 if mysql_version_is_at_least "5.1.10" ; then 664 if mysql_version_is_at_least "5.1.10" ; then
595 configure_51 665 configure_51
602 filter-flags "-O" "-O[01]" 672 filter-flags "-O" "-O[01]"
603 673
604 # glib-2.3.2_pre fix, bug #16496 674 # glib-2.3.2_pre fix, bug #16496
605 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 675 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
606 676
677 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
678 # fail badly during cluster startup.
679 if [[ $(gcc-major-version) -lt 4 ]]; then
680 filter-flags "-fstack-protector-all"
681 fi
682
607 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 683 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
608 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 684 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
609 mysql_version_is_at_least "5.0" \ 685 mysql_version_is_at_least "5.0" \
610 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 686 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
611 export CXXFLAGS 687 export CXXFLAGS
612 688
689 # bug #283926, with GCC4.4, this is required to get correct behavior.
690 append-flags -fno-strict-aliasing
691
613 econf \ 692 econf \
614 --program-suffix="${MY_SUFFIX}" \
615 --libexecdir="/usr/sbin" \ 693 --libexecdir="/usr/sbin" \
616 --sysconfdir="${MY_SYSCONFDIR}" \ 694 --sysconfdir="${MY_SYSCONFDIR}" \
617 --localstatedir="${MY_LOCALSTATEDIR}" \ 695 --localstatedir="${MY_LOCALSTATEDIR}" \
618 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 696 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
619 --libdir="${MY_LIBDIR}" \ 697 --libdir="${MY_LIBDIR}" \
628 # TODO: Move this before autoreconf !!! 706 # TODO: Move this before autoreconf !!!
629 find . -type f -name Makefile -print0 \ 707 find . -type f -name Makefile -print0 \
630 | xargs -0 -n100 sed -i \ 708 | xargs -0 -n100 sed -i \
631 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 709 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
632 710
711 if [[ $EAPI == 2 ]]; then
712 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
713 fi
714}
715
716# @FUNCTION: mysql_src_compile
717# @DESCRIPTION:
718# Compile the mysql code.
719mysql_src_compile() {
720 # Be backwards compatible for now
721 case ${EAPI:-0} in
722 2) : ;;
723 0 | 1) mysql_src_configure ;;
724 esac
725
633 emake || die "emake failed" 726 emake || die "emake failed"
634 727
635 mysql_version_is_at_least "5.1.1" && useq "pbxt" && pbxt_src_compile 728 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
636} 729}
637 730
731# @FUNCTION: mysql_src_install
732# @DESCRIPTION:
733# Install mysql.
638mysql_src_install() { 734mysql_src_install() {
639 # Make sure the vars are correctly initialized 735 # Make sure the vars are correctly initialized
640 mysql_init_vars 736 mysql_init_vars
641 737
642 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 738 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
643 739
644 mysql_version_is_at_least "5.1.12" && useq "pbxt" && pbxt_src_install 740 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
645
646 insinto "${MY_INCLUDEDIR}"
647 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
648 741
649 # Convenience links 742 # Convenience links
743 einfo "Making Convenience links for mysqlcheck multi-call binary"
650 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 744 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
651 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 745 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
652 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 746 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
653 747
654 # Various junk (my-*.cnf moved elsewhere) 748 # Various junk (my-*.cnf moved elsewhere)
749 einfo "Removing duplicate /usr/share/mysql files"
655 rm -Rf "${D}/usr/share/info" 750 rm -Rf "${D}/usr/share/info"
656 for removeme in "mysql-log-rotate" mysql.server* \ 751 for removeme in "mysql-log-rotate" mysql.server* \
657 binary-configure* my-*.cnf mi_test_all* 752 binary-configure* my-*.cnf mi_test_all*
658 do 753 do
659 rm -f "${D}"/usr/share/mysql/${removeme} 754 rm -f "${D}"/usr/share/mysql/${removeme}
660 done 755 done
661 756
662 # TODO change at Makefile-am level
663 if [[ ${PN} == "mysql-slotted" ]] ; then
664 for moveme in "mysql_fix_privilege_tables.sql" \
665 "fill_help_tables.sql" "ndb-config-2-node.ini"
666 do
667 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
668 done
669 fi
670
671 # clean up stuff for a minimal build 757 # Clean up stuff for a minimal build
672 if useq "minimal" ; then 758 if use minimal ; then
759 einfo "Remove all extra content for minimal build"
673 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 760 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
674 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 761 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
675 rm -f "${D}/usr/sbin/mysqld" 762 rm -f "${D}/usr/sbin/mysqld"
676 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 763 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
677 fi 764 fi
678 765
679 if [[ ${PN} == "mysql-slotted" ]] ; then
680 local notcatched=$(ls "${D}/usr/share/mysql"/*)
681 if [[ -n "${notcatched}" ]] ; then
682 ewarn "QA notice"
683 ewarn "${notcatched} files in /usr/share/mysql"
684 ewarn "bug mysql-herd to manage them"
685 fi
686 rm -Rf "${D}/usr/share/mysql"
687 fi
688
689 # Configuration stuff 766 # Configuration stuff
690 if mysql_version_is_at_least "4.1" ; then 767 if mysql_version_is_at_least "4.1" ; then
691 mysql_mycnf_version="4.1" 768 mysql_mycnf_version="4.1"
692 else 769 else
693 mysql_mycnf_version="4.0" 770 mysql_mycnf_version="4.0"
694 fi 771 fi
772 einfo "Building default my.cnf"
695 insinto "${MY_SYSCONFDIR}" 773 insinto "${MY_SYSCONFDIR}"
696 doins scripts/mysqlaccess.conf 774 doins scripts/mysqlaccess.conf
697 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \
698 -e "s!@DATADIR@!${DATADIR}!g" \ 775 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
699 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 776 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
700 > "${TMPDIR}/my.cnf.ok" 777 > "${TMPDIR}/my.cnf.ok"
701 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 778 if mysql_version_is_at_least "4.1" && use latin1 ; then
702 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 779 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
703 fi 780 fi
704 newins "${TMPDIR}/my.cnf.ok" my.cnf 781 newins "${TMPDIR}/my.cnf.ok" my.cnf
705 782
706 # Minimal builds don't have the MySQL server 783 # Minimal builds don't have the MySQL server
707 if ! useq "minimal" ; then 784 if ! use minimal ; then
785 einfo "Creating initial directories"
708 # Empty directories ... 786 # Empty directories ...
709 diropts "-m0750" 787 diropts "-m0750"
710 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 788 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
711 dodir "${DATADIR}" 789 dodir "${MY_DATADIR}"
712 keepdir "${DATADIR}" 790 keepdir "${MY_DATADIR}"
713 chown -R mysql:mysql "${D}/${DATADIR}" 791 chown -R mysql:mysql "${D}/${MY_DATADIR}"
714 fi 792 fi
715 793
716 diropts "-m0755" 794 diropts "-m0755"
717 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 795 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
718 dodir "${folder}" 796 dodir "${folder}"
720 chown -R mysql:mysql "${D}/${folder}" 798 chown -R mysql:mysql "${D}/${folder}"
721 done 799 done
722 fi 800 fi
723 801
724 # Docs 802 # Docs
803 einfo "Installing docs"
725 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 804 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
805 doinfo "${S}"/Docs/mysql.info
726 806
727 # Minimal builds don't have the MySQL server 807 # Minimal builds don't have the MySQL server
728 if ! useq "minimal" ; then 808 if ! use minimal ; then
809 einfo "Including support files and sample configurations"
810 docinto "support-files"
811 for script in \
812 "${S}"/support-files/my-*.cnf \
813 "${S}"/support-files/magic \
814 "${S}"/support-files/ndb-config-2-node.ini
815 do
816 dodoc "${script}"
817 done
818
819 docinto "scripts"
820 for script in "${S}"/scripts/mysql* ; do
821 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
822 done
823
824 fi
825
826 mysql_lib_symlinks "${D}"
827}
828
829# @FUNCTION: mysql_pkg_preinst
830# @DESCRIPTION:
831# Create the user and groups for mysql - die if that fails.
832mysql_pkg_preinst() {
833 enewgroup mysql 60 || die "problem adding 'mysql' group"
834 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
835}
836
837# @FUNCTION: mysql_pkg_postinst
838# @DESCRIPTION:
839# Run post-installation tasks:
840# create the dir for logfiles if non-existant
841# touch the logfiles and secure them
842# install scripts
843# issue required steps for optional features
844# issue deprecation warnings
845mysql_pkg_postinst() {
846 # Make sure the vars are correctly initialized
847 mysql_init_vars
848
849 # Check FEATURES="collision-protect" before removing this
850 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
851
852 # Secure the logfiles
853 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
854 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
855 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
856
857 # Minimal builds don't have the MySQL server
858 if ! use minimal ; then
729 docinto "support-files" 859 docinto "support-files"
730 for script in \ 860 for script in \
731 support-files/my-*.cnf \ 861 support-files/my-*.cnf \
732 support-files/magic \ 862 support-files/magic \
733 support-files/ndb-config-2-node.ini 863 support-files/ndb-config-2-node.ini
737 867
738 docinto "scripts" 868 docinto "scripts"
739 for script in scripts/mysql* ; do 869 for script in scripts/mysql* ; do
740 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 870 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
741 done 871 done
742 fi
743 872
744 if [[ ${PN} == "mysql-slotted" ]] ; then 873 einfo
745 # MOVED HERE DUE TO BUG #121445 874 elog "You might want to run:"
746 # create a list of files, to be used 875 elog "\"emerge --config =${CATEGORY}/${PF}\""
747 # by external utilities 876 elog "if this is a new install."
748 mkdir -p "${D}/var/lib/eselect/mysql/" 877 einfo
749 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
750 pushd "${D}/" &>/dev/null
751 find usr/bin/ usr/sbin/ \
752 -type f -name "*${MY_SUFFIX}*" \
753 -and -not -name "mysql_config${MY_SUFFIX}" \
754 > "${filelist}"
755 find usr/share/man \
756 -type f -name "*${MY_SUFFIX}*" \
757 | sed -e 's/$/.gz/' \
758 >> "${filelist}"
759 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
760 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
761 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
762 popd &>/dev/null
763 fi 878 fi
764 879
765 mysql_lib_symlinks "${D}" 880 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
766} 881 # TODO: explain it better
882 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
883 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
884 elog "if, after that, you cannot start the MySQL server,"
885 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
886 elog "use the MySQL upgrade script to restore the table"
887 elog "or execute the following SQL command:"
888 elog " CREATE TABLE IF NOT EXISTS plugin ("
889 elog " name char(64) binary DEFAULT '' NOT NULL,"
890 elog " dl char(128) DEFAULT '' NOT NULL,"
891 elog " PRIMARY KEY (name)"
892 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
893 fi
767 894
768mysql_pkg_preinst() { 895 mysql_check_version_range "4.0 to 5.0.99.99" \
769 enewgroup mysql 60 || die "problem adding 'mysql' group" 896 && use berkdb \
770 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 897 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
771} 898}
772 899
900# @FUNCTION: mysql_pkg_config
901# @DESCRIPTION:
902# Configure mysql environment.
773mysql_pkg_postinst() { 903mysql_pkg_config() {
904 local old_MY_DATADIR="${MY_DATADIR}"
905
774 # Make sure the vars are correctly initialized 906 # Make sure the vars are correctly initialized
775 mysql_init_vars 907 mysql_init_vars
776 908
777 # Check FEATURES="collision-protect" before removing this
778 [[ -d "${ROOT}/var/log/mysql" ]] \
779 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
780
781 # Secure the logfiles
782 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
783 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
784 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
785
786 # Minimal builds don't have the MySQL server
787 if ! useq "minimal" ; then
788 docinto "support-files"
789 for script in \
790 support-files/my-*.cnf \
791 support-files/magic \
792 support-files/ndb-config-2-node.ini
793 do
794 dodoc "${script}"
795 done
796
797 docinto "scripts"
798 for script in scripts/mysql* ; do
799 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
800 done
801 fi
802
803 #einfo "you may want to read slotting upgrade documents in the overlay"
804 if mysql_version_is_at_least "5.1" && useq "pbxt" ; then
805 # TODO tell it better ;-)
806 elog "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
807 elog "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
808 elog "if, after that you cannot start the mysql server"
809 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
810 elog "use the mysql upgrade script to restore the table"
811 elog " or "
812 elog "CREATE TABLE IF NOT EXISTS plugin ("
813 elog " name char(64) binary DEFAULT '' NOT NULL,"
814 elog " dl char(128) DEFAULT '' NOT NULL,"
815 elog " PRIMARY KEY (name)"
816 elog ") CHARACTER SET utf8 COLLATE utf8_bin;"
817 fi
818 mysql_check_version_range "4.0 to 5.0.99.99" \
819 && useq "berkdb" \
820 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
821}
822
823mysql_pkg_config() {
824 # Make sure the vars are correctly initialized
825 mysql_init_vars
826
827 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 909 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
828 910
829 if built_with_use ${CATEGORY}/${PN} minimal ; then 911 if built_with_use ${CATEGORY}/${PN} minimal ; then
830 die "Minimal builds do NOT include the MySQL server" 912 die "Minimal builds do NOT include the MySQL server"
913 fi
914
915 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
916 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
917 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
918
919 if [[ -d "${old_MY_DATADIR_s}" ]]; then
920 if [[ -d "${MY_DATADIR_s}" ]]; then
921 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
922 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
923 else
924 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
925 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
926 || die "Moving MY_DATADIR failed"
927 fi
928 else
929 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
930 if [[ -d "${MY_DATADIR_s}" ]]; then
931 ewarn "Attempting to use ${MY_DATADIR_s}"
932 else
933 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
934 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
935 fi
936 fi
831 fi 937 fi
832 938
833 local pwd1="a" 939 local pwd1="a"
834 local pwd2="b" 940 local pwd2="b"
835 local maxtry=5 941 local maxtry=5
836 942
837 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 943 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
838 ewarn "You have already a MySQL database in place." 944 ewarn "You have already a MySQL database in place."
839 ewarn "(${ROOT}/${DATADIR}/*)" 945 ewarn "(${ROOT}/${MY_DATADIR}/*)"
840 ewarn "Please rename or delete it if you wish to replace it." 946 ewarn "Please rename or delete it if you wish to replace it."
841 die "MySQL database already exists!" 947 die "MySQL database already exists!"
842 fi 948 fi
949
950 # Bug #213475 - MySQL _will_ object strenously if your machine is named
951 # localhost. Also causes weird failures.
952 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
843 953
844 einfo "Creating the mysql database and setting proper" 954 einfo "Creating the mysql database and setting proper"
845 einfo "permissions on it ..." 955 einfo "permissions on it ..."
846 956
847 einfo "Insert a password for the mysql 'root' user" 957 einfo "Insert a password for the mysql 'root' user"
863 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 973 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
864 || touch "${TMPDIR}/fill_help_tables.sql" 974 || touch "${TMPDIR}/fill_help_tables.sql"
865 help_tables="${TMPDIR}/fill_help_tables.sql" 975 help_tables="${TMPDIR}/fill_help_tables.sql"
866 976
867 pushd "${TMPDIR}" &>/dev/null 977 pushd "${TMPDIR}" &>/dev/null
868 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 978 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
979 if [ $? -ne 0 ]; then
980 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
981 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
982 fi
869 popd &>/dev/null 983 popd &>/dev/null
870 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 984 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
871 || die "MySQL databases not installed" 985 || die "MySQL databases not installed"
872 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 986 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
873 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 987 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
874 988
875 if mysql_version_is_at_least "4.1.3" ; then 989 if mysql_version_is_at_least "4.1.3" ; then
876 options="--skip-ndbcluster" 990 options="--skip-ndbcluster"
877 991
878 # Filling timezones, see 992 # Filling timezones, see
889 local mysqld="${ROOT}/usr/sbin/mysqld \ 1003 local mysqld="${ROOT}/usr/sbin/mysqld \
890 ${options} \ 1004 ${options} \
891 --user=mysql \ 1005 --user=mysql \
892 --skip-grant-tables \ 1006 --skip-grant-tables \
893 --basedir=${ROOT}/usr \ 1007 --basedir=${ROOT}/usr \
894 --datadir=${ROOT}/${DATADIR} \ 1008 --datadir=${ROOT}/${MY_DATADIR} \
895 --skip-innodb \ 1009 --skip-innodb \
896 --skip-bdb \ 1010 --skip-bdb \
897 --skip-networking \ 1011 --skip-networking \
898 --max_allowed_packet=8M \ 1012 --max_allowed_packet=8M \
899 --net_buffer_length=16K \ 1013 --net_buffer_length=16K \
928 einfo "Stopping the server ..." 1042 einfo "Stopping the server ..."
929 wait %1 1043 wait %1
930 einfo "Done" 1044 einfo "Done"
931} 1045}
932 1046
1047# @FUNCTION: mysql_pkg_postrm
1048# @DESCRIPTION:
1049# Remove mysql symlinks.
933mysql_pkg_postrm() { 1050mysql_pkg_postrm() {
934 if [[ ${PN} == "mysql-slotted" ]] ; then
935 mysql_lib_symlinks 1051 : # mysql_lib_symlinks "${D}"
936 mysql_clients_link_to_best_version
937 fi
938} 1052}

Legend:
Removed from v.1.66  
changed lines
  Added in v.1.120

  ViewVC Help
Powered by ViewVC 1.1.20