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

Diff of /eclass/mysql.eclass

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

Revision 1.120 Revision 1.166
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2011 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.120 2009/12/09 18:46:53 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
9# - Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org> 9# Robin H. Johnson <robbat2@gentoo.org>
10# @AUTHOR:
11# Francesco Riosa (Retired) <vivo@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds 12# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION: 13# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds 14# 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# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm 16# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks. 17# phase hooks.
17 18
18WANT_AUTOCONF="latest" 19WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 20WANT_AUTOMAKE="latest"
20 21
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator 22inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
23
24# Shorten the path because the socket path length must be shorter than 107 chars
25# and we will run a mysql server during test phase
26S="${WORKDIR}/mysql"
27
28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
30 EGIT_PROJECT=mysql-extras
31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
32 inherit git
33fi
22 34
23case "${EAPI:-0}" in 35case "${EAPI:-0}" in
24 2) 36 2)
25 EXPORT_FUNCTIONS pkg_setup \ 37 EXPORT_FUNCTIONS pkg_setup \
26 src_unpack src_prepare \ 38 src_unpack src_prepare \
40 ;; 52 ;;
41 *) 53 *)
42 die "Unsupported EAPI: ${EAPI}" ;; 54 die "Unsupported EAPI: ${EAPI}" ;;
43esac 55esac
44 56
45# Shorten the path because the socket path length must be shorter than 107 chars
46# and we will run a mysql server during test phase
47S="${WORKDIR}/mysql"
48 57
49[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" 58# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
50if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 59# @DESCRIPTION:
51 EGIT_PROJECT=mysql-extras 60# Upstream MySQL considers the first two parts of the version number to be the
52 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 61# major version. Upgrades that change major version should always run
53 inherit git 62# mysql_upgrade.
63MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
64
65# Cluster is a special case...
66if [[ "${PN}" == "mysql-cluster" ]]; then
67 case $PV in
68 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
69 esac
54fi 70fi
71
55 72
56# @ECLASS-VARIABLE: MYSQL_VERSION_ID 73# @ECLASS-VARIABLE: MYSQL_VERSION_ID
57# @DESCRIPTION: 74# @DESCRIPTION:
58# MYSQL_VERSION_ID will be: 75# MYSQL_VERSION_ID will be:
59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 76# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
77# @DESCRIPTION: 94# @DESCRIPTION:
78# Specifiy if community features are available. Possible values are 1 (yes) 95# Specifiy if community features are available. Possible values are 1 (yes)
79# and 0 (no). 96# and 0 (no).
80# Community features are available in mysql-community 97# Community features are available in mysql-community
81# AND in the re-merged mysql-5.0.82 and newer 98# AND in the re-merged mysql-5.0.82 and newer
82if [ "${PN}" == "mysql-community" ]; then 99if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
83 MYSQL_COMMUNITY_FEATURES=1 100 MYSQL_COMMUNITY_FEATURES=1
84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then 101elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
85 MYSQL_COMMUNITY_FEATURES=1 102 MYSQL_COMMUNITY_FEATURES=1
86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then 103elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
87 MYSQL_COMMUNITY_FEATURES=1 104 MYSQL_COMMUNITY_FEATURES=1
88elif [ "${PV#5.4}" != "${PV}" ]; then 105elif [ "${PV#5.4}" != "${PV}" ] ; then
106 MYSQL_COMMUNITY_FEATURES=1
107elif [ "${PV#5.5}" != "${PV}" ] ; then
108 MYSQL_COMMUNITY_FEATURES=1
109elif [ "${PV#6}" != "${PV}" ] ; then
110 MYSQL_COMMUNITY_FEATURES=1
111elif [ "${PV#7}" != "${PV}" ] ; then
89 MYSQL_COMMUNITY_FEATURES=1 112 MYSQL_COMMUNITY_FEATURES=1
90else 113else
91 MYSQL_COMMUNITY_FEATURES=0 114 MYSQL_COMMUNITY_FEATURES=0
92fi 115fi
93 116
108 >=sys-apps/sed-4 131 >=sys-apps/sed-4
109 >=sys-apps/texinfo-4.7-r1 132 >=sys-apps/texinfo-4.7-r1
110 >=sys-libs/readline-4.1 133 >=sys-libs/readline-4.1
111 >=sys-libs/zlib-1.2.3" 134 >=sys-libs/zlib-1.2.3"
112 135
136[[ "${PN}" == "mariadb" ]] \
137&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
138
113# Having different flavours at the same time is not a good idea 139# Having different flavours at the same time is not a good idea
114for i in "" "-community" ; do 140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
115 [[ "${i}" == ${PN#mysql} ]] || 141 [[ "${i}" == ${PN} ]] ||
116 DEPEND="${DEPEND} !dev-db/mysql${i}" 142 DEPEND="${DEPEND} !dev-db/${i}"
117done 143done
118 144
145# prefix: first need to implement something for #196294
119RDEPEND="${DEPEND} 146RDEPEND="${DEPEND}
120 !minimal? ( dev-db/mysql-init-scripts ) 147 !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
121 selinux? ( sec-policy/selinux-mysql )" 148 selinux? ( sec-policy/selinux-mysql )"
149
150DEPEND="${DEPEND}
151 virtual/yacc"
152
153if [ "${EAPI:-0}" = "2" ]; then
154 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
155fi
122 156
123# compile-time-only 157# compile-time-only
124mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
125|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
126 160
127# compile-time-only 161# compile-time-only
128mysql_version_is_at_least "5.1.12" \ 162mysql_version_is_at_least "5.1.12" \
129&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 163&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
130 164
165[[ "${PN}" == "mariadb" ]] \
166&& mysql_version_is_at_least "5.2" \
167&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
168#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
169# sphinx? ( app-misc/sphinx )"
170
131# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 171# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
132PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 172PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
133 173
134# For other stuff to bring us in 174# For other stuff to bring us in
135PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})" 175PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
136 176
137# Work out the default SERVER_URI correctly 177# Work out the default SERVER_URI correctly
138if [ -z "${SERVER_URI}" ]; then 178if [ -z "${SERVER_URI}" ]; then
179 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
180 if [ "${PN}" == "mariadb" ]; then
181 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
182 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
183 SERVER_URI="
184 http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
185 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
186 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
187 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
188 http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
189 http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
190 "
139 # The community build is on the mirrors 191 # The community and cluster builds are on the mirrors
140 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 192 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
141 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 193 if [[ "${PN}" == "mysql-cluster" ]] ; then
194 URI_DIR="MySQL-Cluster"
195 URI_FILE="mysql-cluster-gpl"
196 else
197 URI_DIR="MySQL"
198 URI_FILE="mysql"
199 fi
200 URI_A="${URI_FILE}-${MY_PV}.tar.gz"
201 MIRROR_PV=$(get_version_component_range 1-2 ${PV})
202 # Recently upstream switched to an archive site, and not on mirrors
203 SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
204 mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
142 # The (old) enterprise source is on the primary site only 205 # The (old) enterprise source is on the primary site only
143 elif [ "${PN}" == "mysql" ]; then 206 elif [ "${PN}" == "mysql" ]; then
144 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 207 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
145 fi 208 fi
146fi 209fi
147 210
148# Define correct SRC_URIs 211# Define correct SRC_URIs
149SRC_URI="${SERVER_URI}" 212SRC_URI="${SERVER_URI}"
150 213
151[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI} 214# Gentoo patches to MySQL
215[[ ${MY_EXTRAS_VER} != live ]] \
216&& SRC_URI="${SRC_URI}
152 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 217 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
153 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 218 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
154PBXT_SRC_URI="mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz" 219 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
155mysql_version_is_at_least "5.1.12" \
156&& [[ -n "${PBXT_VERSION}" ]] \
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} )"
164 220
165DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 221DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
166HOMEPAGE="http://www.mysql.com/" 222HOMEPAGE="http://www.mysql.com/"
223if [[ "${PN}" == "mariadb" ]]; then
224 HOMEPAGE="http://askmonty.org/"
225 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
226fi
227if [[ "${PN}" == "mysql-community" ]]; then
228 DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
229fi
167LICENSE="GPL-2" 230LICENSE="GPL-2"
168SLOT="0" 231SLOT="0"
169IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static" 232IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
170 233
171mysql_version_is_at_least "4.1" \ 234mysql_version_is_at_least "4.1" \
172&& IUSE="${IUSE} latin1" 235&& IUSE="${IUSE} latin1"
173 236
174mysql_version_is_at_least "4.1.3" \ 237if mysql_version_is_at_least "4.1.3" ; then
175&& IUSE="${IUSE} cluster extraengine" 238 IUSE="${IUSE} extraengine"
239 if [[ "${PN}" != "mysql-cluster" ]] ; then
240 IUSE="${IUSE} cluster"
241 fi
242fi
176 243
177mysql_version_is_at_least "5.0" \ 244mysql_version_is_at_least "5.0" \
178|| IUSE="${IUSE} raid" 245|| IUSE="${IUSE} raid"
179 246
180mysql_version_is_at_least "5.0.18" \ 247mysql_version_is_at_least "5.0.18" \
181&& IUSE="${IUSE} max-idx-128" 248&& IUSE="${IUSE} max-idx-128"
182 249
183mysql_version_is_at_least "5.1" \ 250mysql_version_is_at_least "5.1" \
184|| IUSE="${IUSE} berkdb" 251|| IUSE="${IUSE} berkdb"
185 252
186mysql_version_is_at_least "5.1.12" \
187&& IUSE="${IUSE} pbxt"
188
189mysql_version_is_at_least "5.1.26" \
190&& IUSE="${IUSE} xtradb"
191
192[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 253[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
193&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 254&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
255
256[[ "${PN}" == "mariadb" ]] \
257&& IUSE="${IUSE} libevent"
258
259[[ "${PN}" == "mariadb" ]] \
260&& mysql_version_is_at_least "5.2" \
261&& IUSE="${IUSE} oqgraph"
262#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
263#&& IUSE="${IUSE} oqgraph sphinx"
264
265# MariaDB has integrated PBXT
266# PBXT_VERSION means that we have a PBXT patch for this PV
267# PBXT was only introduced after 5.1.12
268pbxt_patch_available() {
269 [[ "${PN}" != "mariadb" ]] \
270 && mysql_version_is_at_least "5.1.12" \
271 && [[ -n "${PBXT_VERSION}" ]]
272 return $?
273}
274
275pbxt_available() {
276 pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
277 return $?
278}
279
280# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
281# MariaDB has integrated XtraDB
282# XTRADB_VERS means that we have a XTRADB patch for this PV
283# XTRADB was only introduced after 5.1.26
284xtradb_patch_available() {
285 [[ "${PN}" != "mariadb" ]] \
286 && mysql_version_is_at_least "5.1.26" \
287 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
288 return $?
289}
290
291
292pbxt_patch_available \
293&& PBXT_P="pbxt-${PBXT_VERSION}" \
294&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
295&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
296
297# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
298# vs. built outside the dir
299pbxt_available \
300&& IUSE="${IUSE} pbxt" \
301&& mysql_version_is_at_least "5.1.40" \
302&& PBXT_NEWSTYLE=1
303
304xtradb_patch_available \
305&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
306&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
307&& XTRADB_SRC_B1="http://www.percona.com/" \
308&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
309&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
310&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
311&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
312&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
313&& IUSE="${IUSE} xtradb"
194 314
195# 315#
196# HELPER FUNCTIONS: 316# HELPER FUNCTIONS:
197# 317#
198 318
199# @FUNCTION: mysql_disable_test 319# @FUNCTION: mysql_disable_test
200# @DESCRIPTION: 320# @DESCRIPTION:
201# Helper function to disable specific tests. 321# Helper function to disable specific tests.
202mysql_disable_test() { 322mysql_disable_test() {
323 local rawtestname testname testsuite reason mysql_disable_file
203 local testname="${1}" ; shift 324 rawtestname="${1}" ; shift
204 local reason="${@}" 325 reason="${@}"
326 ewarn "test '${rawtestname}' disabled: '${reason}'"
327
328 testsuite="${rawtestname/.*}"
329 testname="${rawtestname/*.}"
205 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 330 mysql_disable_file="${S}/mysql-test/t/disabled.def"
331 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
206 echo ${testname} : ${reason} >> "${mysql_disable_file}" 332 echo ${testname} : ${reason} >> "${mysql_disable_file}"
207 ewarn "test '${testname}' disabled: '${reason}'" 333
334 # ${S}/mysql-tests/t/disabled.def
335 #
336 # ${S}/mysql-tests/suite/federated/disabled.def
337 #
338 # ${S}/mysql-tests/suite/jp/t/disabled.def
339 # ${S}/mysql-tests/suite/ndb/t/disabled.def
340 # ${S}/mysql-tests/suite/rpl/t/disabled.def
341 # ${S}/mysql-tests/suite/parts/t/disabled.def
342 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
343 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
344 # ${S}/mysql-tests/suite/binlog/t/disabled.def
345 # ${S}/mysql-tests/suite/innodb/t/disabled.def
346 if [ -n "${testsuite}" ]; then
347 for mysql_disable_file in \
348 ${S}/mysql-test/suite/${testsuite}/disabled.def \
349 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
350 FAILED ; do
351 [ -f "${mysql_disable_file}" ] && break
352 done
353 if [ "${mysql_disabled_file}" != "FAILED" ]; then
354 echo "${testname} : ${reason}" >> "${mysql_disable_file}"
355 else
356 ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
357 fi
358 fi
208} 359}
209 360
210# @FUNCTION: mysql_init_vars 361# @FUNCTION: mysql_init_vars
211# @DESCRIPTION: 362# @DESCRIPTION:
212# void mysql_init_vars() 363# void mysql_init_vars()
263 MY_DATADIR="${new_MY_DATADIR}" 414 MY_DATADIR="${new_MY_DATADIR}"
264 fi 415 fi
265 fi 416 fi
266 fi 417 fi
267 418
419 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
268 MY_SOURCEDIR=${SERVER_URI##*/} 420 MY_SOURCEDIR=${SERVER_URI##*/}
269 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 421 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
422 fi
270 423
271 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 424 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
272 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 425 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
273 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 426 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
274} 427}
321 if use debug ; then 474 if use debug ; then
322 myconf="${myconf} --with-debug=full" 475 myconf="${myconf} --with-debug=full"
323 else 476 else
324 myconf="${myconf} --without-debug" 477 myconf="${myconf} --without-debug"
325 mysql_version_is_at_least "4.1.3" \ 478 mysql_version_is_at_least "4.1.3" \
326 && use cluster \ 479 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
327 && myconf="${myconf} --without-ndb-debug" 480 && myconf="${myconf} --without-ndb-debug"
328 fi 481 fi
329 482
330 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 483 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
331 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 484 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
355 myconf="${myconf} $(use_with perl bench)" 508 myconf="${myconf} $(use_with perl bench)"
356 myconf="${myconf} --enable-assembler" 509 myconf="${myconf} --enable-assembler"
357 myconf="${myconf} --with-extra-tools" 510 myconf="${myconf} --with-extra-tools"
358 myconf="${myconf} --with-innodb" 511 myconf="${myconf} --with-innodb"
359 myconf="${myconf} --without-readline" 512 myconf="${myconf} --without-readline"
513 myconf="${myconf} $(use_with ssl openssl)"
360 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 514 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
361 515
362 # --with-vio is not needed anymore, it's on by default and 516 # --with-vio is not needed anymore, it's on by default and
363 # has been removed from configure 517 # has been removed from configure
518 # Apply to 4.x and 5.0.[0-3]
364 if use ssl ; then 519 if use ssl ; then
365 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 520 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
366 fi
367
368 if mysql_version_is_at_least "5.1.11" ; then
369 myconf="${myconf} $(use_with ssl)"
370 else
371 myconf="${myconf} $(use_with ssl openssl)"
372 fi 521 fi
373 522
374 if mysql_version_is_at_least "5.0.60" ; then 523 if mysql_version_is_at_least "5.0.60" ; then
375 if use berkdb ; then 524 if use berkdb ; then
376 elog "Berkeley DB support was disabled due to build failures" 525 elog "Berkeley DB support was disabled due to build failures"
392 myconf="${myconf} --without-berkeley-db" 541 myconf="${myconf} --without-berkeley-db"
393 fi 542 fi
394 543
395 if mysql_version_is_at_least "4.1.3" ; then 544 if mysql_version_is_at_least "4.1.3" ; then
396 myconf="${myconf} --with-geometry" 545 myconf="${myconf} --with-geometry"
546 if [[ "${PN}" != "mysql-cluster" ]] ; then
397 myconf="${myconf} $(use_with cluster ndbcluster)" 547 myconf="${myconf} $(use_with cluster ndbcluster)"
548 fi
398 fi 549 fi
399 550
400 if mysql_version_is_at_least "4.1.3" && use extraengine ; then 551 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
401 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 552 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
402 myconf="${myconf} --with-archive-storage-engine" 553 myconf="${myconf} --with-archive-storage-engine"
433 584
434configure_51() { 585configure_51() {
435 # TODO: !!!! readd --without-readline 586 # TODO: !!!! readd --without-readline
436 # the failure depend upon config/ac-macros/readline.m4 checking into 587 # the failure depend upon config/ac-macros/readline.m4 checking into
437 # readline.h instead of history.h 588 # readline.h instead of history.h
438 myconf="${myconf} $(use_with ssl)" 589 myconf="${myconf} $(use_with ssl ssl /usr)"
439 myconf="${myconf} --enable-assembler" 590 myconf="${myconf} --enable-assembler"
440 myconf="${myconf} --with-geometry" 591 myconf="${myconf} --with-geometry"
441 myconf="${myconf} --with-readline" 592 myconf="${myconf} --with-readline"
442 myconf="${myconf} --with-row-based-replication"
443 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 593 myconf="${myconf} --with-zlib-dir=/usr/"
444 myconf="${myconf} --without-pstack" 594 myconf="${myconf} --without-pstack"
595 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
596
597 # This is an explict die here, because if we just forcibly disable it, then the
598 # user's data is not accessible.
599 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
445 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 600 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
601 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
602 myconf="${myconf} $(use_enable community community-features)"
603 if use community; then
604 myconf="${myconf} $(use_enable profiling)"
605 else
606 myconf="${myconf} --disable-profiling"
607 fi
608 fi
609
610 # Scan for all available plugins
611 local plugins_avail="$(
612 LANG=C \
613 find "${S}" \
614 \( \
615 -name 'plug.in' \
616 -o -iname 'configure.in' \
617 -o -iname 'configure.ac' \
618 \) \
619 -print0 \
620 | xargs -0 sed -r -n \
621 -e '/^MYSQL_STORAGE_ENGINE/{
622 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
623 s~^([^ ]+).*~\1~gp;
624 }' \
625 | tr -s '\n' ' '
626 )"
446 627
447 # 5.1 introduces a new way to manage storage engines (plugins) 628 # 5.1 introduces a new way to manage storage engines (plugins)
448 # like configuration=none 629 # like configuration=none
630 # This base set are required, and will always be statically built.
449 local plugins="csv,myisam,myisammrg,heap" 631 local plugins_sta="csv myisam myisammrg heap"
632 local plugins_dyn=""
633 local plugins_dis="example ibmdb2i"
634
635 # These aren't actually required by the base set, but are really useful:
636 plugins_sta="${plugins_sta} archive blackhole"
637
638 # default in 5.5.4
639 if mysql_version_is_at_least "5.5.4" ; then
640 plugins_sta="${plugins_sta} partition"
641 fi
642 # Now the extras
450 if use extraengine ; then 643 if use extraengine ; then
451 # like configuration=max-no-ndb, archive and example removed in 5.1.11 644 # like configuration=max-no-ndb, archive and example removed in 5.1.11
452 plugins="${plugins},archive,blackhole,example,federated,partition" 645 # not added yet: ibmdb2i
646 # Not supporting as examples: example,daemon_example,ftexample
647 plugins_sta="${plugins_sta} partition"
453 648
649 if [[ "${PN}" != "mariadb" ]] ; then
454 elog "Before using the Federated storage engine, please be sure to read" 650 elog "Before using the Federated storage engine, please be sure to read"
455 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 651 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
652 plugins_dyn="${plugins_sta} federated"
653 else
654 elog "MariaDB includes the FederatedX engine. Be sure to read"
655 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
656 plugins_dyn="${plugins_sta} federatedx"
456 fi 657 fi
658 else
659 plugins_dis="${plugins_dis} partition federated"
660 fi
457 661
458 # Upstream specifically requests that InnoDB always be built. 662 # Upstream specifically requests that InnoDB always be built:
459 plugins="${plugins},innobase" 663 # - innobase, innodb_plugin
664 # Build falcon if available for 6.x series.
665 for i in innobase falcon ; do
666 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
667 done
668 for i in innodb_plugin ; do
669 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
670 done
460 671
461 # like configuration=max-no-ndb 672 # like configuration=max-no-ndb
462 if use cluster ; then 673 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
463 plugins="${plugins},ndbcluster" 674 plugins_sta="${plugins_sta} ndbcluster partition"
675 plugins_dis="${plugins_dis//partition}"
464 myconf="${myconf} --with-ndb-binlog" 676 myconf="${myconf} --with-ndb-binlog"
677 else
678 plugins_dis="${plugins_dis} ndbcluster"
679 fi
680
681 if [[ "${PN}" == "mariadb" ]] ; then
682 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
683 # caught above.
684 # This is not optional, without it several upstream testcases fail.
685 # Also strongly recommended by upstream.
686 if [[ "${PV}" < "5.2.0" ]] ; then
687 myconf="${myconf} --with-maria-tmp-tables"
688 plugins_sta="${plugins_sta} maria"
689 else
690 myconf="${myconf} --with-aria-tmp-tables"
691 plugins_sta="${plugins_sta} aria"
465 fi 692 fi
466 693
694 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
695 die "The ${P} package doesn't provide innobase nor xtradb"
696
697 for i in innobase xtradb ; do
698 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
699 done
700
701 myconf="${myconf} $(use_with libevent)"
702
467 if mysql_version_is_at_least "5.2" ; then 703 if mysql_version_is_at_least "5.2" ; then
468 plugins="${plugins},falcon" 704 #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
705 #for i in oqgraph sphinx ; do
706 for i in oqgraph ; do
707 use ${i} \
708 && plugins_dyn="${plugins_dyn} ${i}" \
709 || plugins_dis="${plugins_dis} ${i}"
710 done
469 fi 711 fi
712 fi
470 713
714 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
715 use pbxt \
716 && plugins_dyn="${plugins_dyn} pbxt" \
717 || plugins_dis="${plugins_dis} pbxt"
718 fi
719
720 use static && \
721 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
722 plugins_dyn=""
723
724 einfo "Available plugins: ${plugins_avail}"
725 einfo "Dynamic plugins: ${plugins_dyn}"
726 einfo "Static plugins: ${plugins_sta}"
727 einfo "Disabled plugins: ${plugins_dis}"
728
729 # These are the static plugins
471 myconf="${myconf} --with-plugins=${plugins}" 730 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
731 # And the disabled ones
732 for i in ${plugins_dis} ; do
733 myconf="${myconf} --without-plugin-${i}"
734 done
472} 735}
473 736
474pbxt_src_configure() { 737pbxt_src_configure() {
475 mysql_init_vars 738 mysql_init_vars
476 739
477 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 740 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
478 741
479 einfo "Reconfiguring dir '${PWD}'" 742 einfo "Reconfiguring dir '${PWD}'"
480 AT_GNUCONF_UPDATE="yes" eautoreconf 743 eautoreconf
481 744
482 local myconf="" 745 local myconf=""
483 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 746 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
484 use debug && myconf="${myconf} --with-debug=full" 747 use debug && myconf="${myconf} --with-debug=full"
485 # TODO: is it safe/needed to use econf here ?
486 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 748 econf ${myconf} || die "Problem configuring PBXT storage engine"
487} 749}
488 750
489pbxt_src_compile() { 751pbxt_src_compile() {
752
490 # Be backwards compatible for now 753 # Be backwards compatible for now
491 if [[ $EAPI != 2 ]]; then 754 if [[ $EAPI != 2 ]]; then
492 pbxt_src_configure 755 pbxt_src_configure
493 fi 756 fi
494 # TODO: is it safe/needed to use emake here ? 757 # TODO: is it safe/needed to use emake here ?
498 # TODO: modify test suite for PBXT 761 # TODO: modify test suite for PBXT
499} 762}
500 763
501pbxt_src_install() { 764pbxt_src_install() {
502 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 765 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
503 make install || die "Failed to install PBXT" 766 emake install DESTDIR="${D}" || die "Failed to install PBXT"
504 popd 767 popd
505} 768}
506 769
507# 770#
508# EBUILD FUNCTIONS 771# EBUILD FUNCTIONS
513# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 776# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
514# check for conflicting use flags 777# check for conflicting use flags
515# create new user and group for mysql 778# create new user and group for mysql
516# warn about deprecated features 779# warn about deprecated features
517mysql_pkg_setup() { 780mysql_pkg_setup() {
518 if hasq test ${FEATURES} ; then 781 if has test ${FEATURES} ; then
519 if ! use minimal ; then 782 if ! use minimal ; then
520 if [[ $UID -eq 0 ]]; then 783 if [[ $UID -eq 0 ]]; then
521 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 784 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
522 fi 785 fi
523 fi 786 fi
524 fi 787 fi
525 788
789 # bug 350844
790 case "${EAPI:-0}" in
791 0 | 1)
792 if use static && !built_with_use sys-libs/ncurses static-libs; then
793 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
794 fi
795 ;;
796 esac
797
526 # Check for USE flag problems in pkg_setup 798 # Check for USE flag problems in pkg_setup
527 if use static && use ssl ; then 799 if use static && use ssl ; then
528 eerror "MySQL does not support being built statically with SSL support enabled!"
529 die "MySQL does not support being built statically with SSL support enabled!" 800 M="MySQL does not support being built statically with SSL support enabled!"
801 eerror "${M}"
802 die "${M}"
803 fi
804
805 if mysql_version_is_at_least "5.1.51" \
806 && ! mysql_version_is_at_least "5.2" \
807 && use debug ; then
808 # Also in package.use.mask
809 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
530 fi 810 fi
531 811
532 if ! mysql_version_is_at_least "5.0" \ 812 if ! mysql_version_is_at_least "5.0" \
533 && use raid \ 813 && use raid \
534 && use static ; then 814 && use static ; then
536 eerror "with RAID support enabled." 816 eerror "with RAID support enabled."
537 die "USE flags 'raid' and 'static' conflict!" 817 die "USE flags 'raid' and 'static' conflict!"
538 fi 818 fi
539 819
540 if mysql_version_is_at_least "4.1.3" \ 820 if mysql_version_is_at_least "4.1.3" \
541 && ( use cluster || use extraengine ) \ 821 && ( use cluster || use extraengine || use embedded ) \
542 && use minimal ; then 822 && use minimal ; then
543 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
544 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 823 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
824 eerror "${M}"
825 die "${M}"
826 fi
827
828 if mysql_version_is_at_least "5.1" \
829 && xtradb_patch_available \
830 && use xtradb \
831 && use embedded ; then
832 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
833 eerror "${M}"
834 die "${M}"
835 fi
836
837 # Bug #290570, 284946, 307251
838 # Upstream changes made us need a fairly new GCC4.
839 # But only for 5.0.8[3-6]!
840 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
841 GCC_VER=$(gcc-version)
842 case ${GCC_VER} in
843 2*|3*|4.0|4.1|4.2)
844 eerror "Some releases of MySQL required a very new GCC, and then"
845 eerror "later release relaxed that requirement again. Either pick a"
846 eerror "MySQL >=5.0.87, or use a newer GCC."
847 die "Active GCC too old!" ;;
848 esac
545 fi 849 fi
546 850
547 # This should come after all of the die statements 851 # This should come after all of the die statements
548 enewgroup mysql 60 || die "problem adding 'mysql' group" 852 enewgroup mysql 60 || die "problem adding 'mysql' group"
549 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 853 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
550 854
551 mysql_check_version_range "4.0 to 5.0.99.99" \ 855 mysql_check_version_range "4.0 to 5.0.99.99" \
552 && use berkdb \ 856 && use berkdb \
553 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 857 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
858
859 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
860 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
861 ewarn "5.1 series should NOT be put into production. In the near"
862 ewarn "future, it will be disabled from building."
863 ewarn ""
864 ewarn "If you need NDB support, you should instead move to the new"
865 ewarn "mysql-cluster package that represents that upstream NDB"
866 ewarn "development."
867 fi
554} 868}
555 869
556# @FUNCTION: mysql_src_unpack 870# @FUNCTION: mysql_src_unpack
557# @DESCRIPTION: 871# @DESCRIPTION:
558# Unpack the source code and call mysql_src_prepare for EAPI < 2. 872# Unpack the source code and call mysql_src_prepare for EAPI < 2.
587 # Now link in right patches 901 # Now link in right patches
588 mysql_mv_patches 902 mysql_mv_patches
589 # And apply 903 # And apply
590 epatch 904 epatch
591 905
592 # Additional checks, remove bundled zlib 906 # last -fPIC fixup, per bug #305873
907 i="${S}"/storage/innodb_plugin/plug.in
908 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
909
910 # Additional checks, remove bundled zlib (Cluster needs this, for static
911 # memory management in zlib, leave available for Cluster)
912 if [[ "${PN}" != "mysql-cluster" ]] ; then
593 rm -f "${S}/zlib/"*.[ch] 913 rm -f "${S}/zlib/"*.[ch]
594 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 914 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
915 fi
595 rm -f "scripts/mysqlbug" 916 rm -f "scripts/mysqlbug"
596 917
597 # Make charsets install in the right place 918 # Make charsets install in the right place
598 find . -name 'Makefile.am' \ 919 find . -name 'Makefile.am' \
599 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 920 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
600 921
601 if mysql_version_is_at_least "4.1" ; then 922 if mysql_version_is_at_least "4.1" ; then
602 # Remove what needs to be recreated, so we're sure it's actually done 923 # Remove what needs to be recreated, so we're sure it's actually done
924 einfo "Cleaning up old buildscript files"
603 find . -name Makefile \ 925 find . -name Makefile \
604 -o -name Makefile.in \ 926 -o -name Makefile.in \
605 -o -name configure \ 927 -o -name configure \
606 -exec rm -f {} \; 928 -exec rm -f {} \;
607 rm -f "ltmain.sh" 929 rm -f "ltmain.sh"
608 rm -f "scripts/mysqlbug" 930 rm -f "scripts/mysqlbug"
609 fi 931 fi
610 932
611 local rebuilddirlist d 933 local rebuilddirlist d
612 934
935 if xtradb_patch_available && use xtradb ; then
936 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
937 pushd "${S}"/storage >/dev/null
938 i="innobase"
939 o="${WORKDIR}/storage-${i}.mysql-upstream"
940 # Have we been here already?
941 [ -d "${o}" ] && rm -f "${i}"
942 # Or maybe we haven't
943 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
944 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
945 popd >/dev/null
946 fi
947
948 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
949 einfo "Adding storage engine: PBXT"
950 pushd "${S}"/storage >/dev/null
951 i='pbxt'
952 [ -d "${i}" ] && rm -rf "${i}"
953 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
954 popd >/dev/null
955 fi
956
613 if mysql_version_is_at_least "5.1.12" ; then 957 if mysql_version_is_at_least "5.1.12" ; then
614 rebuilddirlist="." 958 rebuilddirlist="."
959 # This does not seem to be needed presently. robbat2 2010/02/23
960 #einfo "Updating innobase cmake"
615 # TODO: check this with a cmake expert 961 ## TODO: check this with a cmake expert
616 cmake \ 962 #cmake \
617 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 963 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
618 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 964 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
619 "storage/innobase" 965 # "storage/innobase"
620 else 966 else
621 rebuilddirlist=". innobase" 967 rebuilddirlist=". innobase"
622 fi 968 fi
623 969
624 for d in ${rebuilddirlist} ; do 970 for d in ${rebuilddirlist} ; do
625 einfo "Reconfiguring dir '${d}'" 971 einfo "Reconfiguring dir '${d}'"
626 pushd "${d}" &>/dev/null 972 pushd "${d}" &>/dev/null
627 AT_GNUCONF_UPDATE="yes" eautoreconf 973 eautoreconf
628 popd &>/dev/null 974 popd &>/dev/null
629 done 975 done
630 976
631 if mysql_check_version_range "4.1 to 5.0.99.99" \ 977 if mysql_check_version_range "4.1 to 5.0.99.99" \
632 && use berkdb ; then 978 && use berkdb ; then
979 einfo "Fixing up berkdb buildsystem"
633 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 980 [[ -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" \ 981 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
635 || die "Could not copy libtool.m4 to bdb/dist/" 982 || die "Could not copy libtool.m4 to bdb/dist/"
636 #These files exist only with libtool-2*, and need to be included. 983 #These files exist only with libtool-2*, and need to be included.
637 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 984 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
686 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 1033 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
687 export CXXFLAGS 1034 export CXXFLAGS
688 1035
689 # bug #283926, with GCC4.4, this is required to get correct behavior. 1036 # bug #283926, with GCC4.4, this is required to get correct behavior.
690 append-flags -fno-strict-aliasing 1037 append-flags -fno-strict-aliasing
1038
1039 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
1040 # causes a mis-compile.
1041 # Upstream bugs:
1042 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
1043 # http://bugs.mysql.com/bug.php?id=45205
1044 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1045 append-flags -fno-omit-frame-pointer && \
1046 filter-flags -fomit-frame-pointer
691 1047
692 econf \ 1048 econf \
693 --libexecdir="/usr/sbin" \ 1049 --libexecdir="/usr/sbin" \
694 --sysconfdir="${MY_SYSCONFDIR}" \ 1050 --sysconfdir="${MY_SYSCONFDIR}" \
695 --localstatedir="${MY_LOCALSTATEDIR}" \ 1051 --localstatedir="${MY_LOCALSTATEDIR}" \
699 --with-low-memory \ 1055 --with-low-memory \
700 --with-client-ldflags=-lstdc++ \ 1056 --with-client-ldflags=-lstdc++ \
701 --enable-thread-safe-client \ 1057 --enable-thread-safe-client \
702 --with-comment="Gentoo Linux ${PF}" \ 1058 --with-comment="Gentoo Linux ${PF}" \
703 --without-docs \ 1059 --without-docs \
1060 --with-LIBDIR="$(get_libdir)" \
704 ${myconf} || die "econf failed" 1061 ${myconf} || die "econf failed"
705 1062
706 # TODO: Move this before autoreconf !!! 1063 # TODO: Move this before autoreconf !!!
707 find . -type f -name Makefile -print0 \ 1064 find . -type f -name Makefile -print0 \
708 | xargs -0 -n100 sed -i \ 1065 | xargs -0 -n100 sed -i \
709 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1066 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
710 1067
711 if [[ $EAPI == 2 ]]; then 1068 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
712 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 1069 pbxt_patch_available && use pbxt && pbxt_src_configure
713 fi 1070 fi
714} 1071}
715 1072
716# @FUNCTION: mysql_src_compile 1073# @FUNCTION: mysql_src_compile
717# @DESCRIPTION: 1074# @DESCRIPTION:
718# Compile the mysql code. 1075# Compile the mysql code.
719mysql_src_compile() { 1076mysql_src_compile() {
720 # Be backwards compatible for now 1077 # Be backwards compatible for now
721 case ${EAPI:-0} in 1078 case ${EAPI:-0} in
722 2) : ;; 1079 2) : ;;
723 0 | 1) mysql_src_configure ;; 1080 0 | 1) mysql_src_configure ;;
724 esac 1081 esac
725 1082
726 emake || die "emake failed" 1083 emake || die "emake failed"
727 1084
728 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 1085 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1086 pbxt_patch_available && use pbxt && pbxt_src_compile
1087 fi
729} 1088}
730 1089
731# @FUNCTION: mysql_src_install 1090# @FUNCTION: mysql_src_install
732# @DESCRIPTION: 1091# @DESCRIPTION:
733# Install mysql. 1092# Install mysql.
734mysql_src_install() { 1093mysql_src_install() {
735 # Make sure the vars are correctly initialized 1094 # Make sure the vars are correctly initialized
736 mysql_init_vars 1095 mysql_init_vars
737 1096
738 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 1097 emake install \
1098 DESTDIR="${D}" \
1099 benchdir_root="${MY_SHAREDSTATEDIR}" \
1100 testroot="${MY_SHAREDSTATEDIR}" \
1101 || die "emake install failed"
739 1102
740 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 1103 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1104 pbxt_patch_available && use pbxt && pbxt_src_install
1105 fi
741 1106
742 # Convenience links 1107 # Convenience links
743 einfo "Making Convenience links for mysqlcheck multi-call binary" 1108 einfo "Making Convenience links for mysqlcheck multi-call binary"
744 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1109 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
745 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1110 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
749 einfo "Removing duplicate /usr/share/mysql files" 1114 einfo "Removing duplicate /usr/share/mysql files"
750 rm -Rf "${D}/usr/share/info" 1115 rm -Rf "${D}/usr/share/info"
751 for removeme in "mysql-log-rotate" mysql.server* \ 1116 for removeme in "mysql-log-rotate" mysql.server* \
752 binary-configure* my-*.cnf mi_test_all* 1117 binary-configure* my-*.cnf mi_test_all*
753 do 1118 do
754 rm -f "${D}"/usr/share/mysql/${removeme} 1119 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
755 done 1120 done
756 1121
757 # Clean up stuff for a minimal build 1122 # Clean up stuff for a minimal build
758 if use minimal ; then 1123 if use minimal ; then
759 einfo "Remove all extra content for minimal build" 1124 einfo "Remove all extra content for minimal build"
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} 1126 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}
762 rm -f "${D}/usr/sbin/mysqld" 1127 rm -f "${D}/usr/sbin/mysqld"
763 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1128 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
764 fi 1129 fi
765 1130
1131 # Unless they explicitly specific USE=test, then do not install the
1132 # testsuite. It DOES have a use to be installed, esp. when you want to do a
1133 # validation of your database configuration after tuning it.
1134 if use !test ; then
1135 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
1136 fi
1137
766 # Configuration stuff 1138 # Configuration stuff
767 if mysql_version_is_at_least "4.1" ; then 1139 case ${MYSQL_PV_MAJOR} in
768 mysql_mycnf_version="4.1"
769 else
770 mysql_mycnf_version="4.0" 1140 3*|4.0) mysql_mycnf_version="4.0" ;;
771 fi 1141 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
772 einfo "Building default my.cnf" 1142 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1143 esac
1144 einfo "Building default my.cnf (${mysql_mycnf_version})"
773 insinto "${MY_SYSCONFDIR}" 1145 insinto "${MY_SYSCONFDIR}"
774 doins scripts/mysqlaccess.conf 1146 doins scripts/mysqlaccess.conf
1147 mycnf_src="my.cnf-${mysql_mycnf_version}"
775 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1148 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
776 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1149 "${FILESDIR}/${mycnf_src}" \
777 > "${TMPDIR}/my.cnf.ok" 1150 > "${TMPDIR}/my.cnf.ok"
778 if mysql_version_is_at_least "4.1" && use latin1 ; then 1151 if use latin1 ; then
779 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 1152 sed -i \
1153 -e "/character-set/s|utf8|latin1|g" \
1154 "${TMPDIR}/my.cnf.ok"
780 fi 1155 fi
781 newins "${TMPDIR}/my.cnf.ok" my.cnf 1156 newins "${TMPDIR}/my.cnf.ok" my.cnf
782 1157
783 # Minimal builds don't have the MySQL server 1158 # Minimal builds don't have the MySQL server
784 if ! use minimal ; then 1159 if ! use minimal ; then
799 done 1174 done
800 fi 1175 fi
801 1176
802 # Docs 1177 # Docs
803 einfo "Installing docs" 1178 einfo "Installing docs"
804 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1179 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
1180 [[ -f "$i" ]] && dodoc "$i"
1181 done
805 doinfo "${S}"/Docs/mysql.info 1182 doinfo "${S}"/Docs/mysql.info
806 1183
807 # Minimal builds don't have the MySQL server 1184 # Minimal builds don't have the MySQL server
808 if ! use minimal ; then 1185 if ! use minimal ; then
809 einfo "Including support files and sample configurations" 1186 einfo "Including support files and sample configurations"
811 for script in \ 1188 for script in \
812 "${S}"/support-files/my-*.cnf \ 1189 "${S}"/support-files/my-*.cnf \
813 "${S}"/support-files/magic \ 1190 "${S}"/support-files/magic \
814 "${S}"/support-files/ndb-config-2-node.ini 1191 "${S}"/support-files/ndb-config-2-node.ini
815 do 1192 do
816 dodoc "${script}" 1193 [[ -f "$script" ]] && dodoc "${script}"
817 done 1194 done
818 1195
819 docinto "scripts" 1196 docinto "scripts"
820 for script in "${S}"/scripts/mysql* ; do 1197 for script in "${S}"/scripts/mysql* ; do
821 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1198 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
822 done 1199 done
823 1200
824 fi 1201 fi
825 1202
826 mysql_lib_symlinks "${D}" 1203 mysql_lib_symlinks "${D}"
860 for script in \ 1237 for script in \
861 support-files/my-*.cnf \ 1238 support-files/my-*.cnf \
862 support-files/magic \ 1239 support-files/magic \
863 support-files/ndb-config-2-node.ini 1240 support-files/ndb-config-2-node.ini
864 do 1241 do
1242 [[ -f "${script}" ]] \
865 dodoc "${script}" 1243 && dodoc "${script}"
866 done 1244 done
867 1245
868 docinto "scripts" 1246 docinto "scripts"
869 for script in scripts/mysql* ; do 1247 for script in scripts/mysql* ; do
1248 [[ -f "${script}" ]] \
870 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1249 && [[ "${script%.sh}" == "${script}" ]] \
1250 && dodoc "${script}"
871 done 1251 done
872 1252
873 einfo 1253 einfo
874 elog "You might want to run:" 1254 elog "You might want to run:"
875 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1255 elog "\"emerge --config =${CATEGORY}/${PF}\""
876 elog "if this is a new install." 1256 elog "if this is a new install."
877 einfo 1257 einfo
878 fi
879 1258
880 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 1259 einfo
1260 elog "If you are upgrading major versions, you should run the"
1261 elog "mysql_upgrade tool."
1262 einfo
1263 fi
1264
1265 if pbxt_available && use pbxt ; then
881 # TODO: explain it better 1266 # TODO: explain it better
882 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1267 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
883 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1268 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
884 elog "if, after that, you cannot start the MySQL server," 1269 elog "if, after that, you cannot start the MySQL server,"
885 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1270 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
936 fi 1321 fi
937 fi 1322 fi
938 1323
939 local pwd1="a" 1324 local pwd1="a"
940 local pwd2="b" 1325 local pwd2="b"
941 local maxtry=5 1326 local maxtry=15
1327
1328 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1329 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1330 fi
942 1331
943 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1332 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
944 ewarn "You have already a MySQL database in place." 1333 ewarn "You have already a MySQL database in place."
945 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1334 ewarn "(${ROOT}/${MY_DATADIR}/*)"
946 ewarn "Please rename or delete it if you wish to replace it." 1335 ewarn "Please rename or delete it if you wish to replace it."
949 1338
950 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1339 # Bug #213475 - MySQL _will_ object strenously if your machine is named
951 # localhost. Also causes weird failures. 1340 # localhost. Also causes weird failures.
952 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1341 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
953 1342
954 einfo "Creating the mysql database and setting proper" 1343 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
955 einfo "permissions on it ..."
956 1344
957 einfo "Insert a password for the mysql 'root' user" 1345 einfo "Please provide a password for the mysql 'root' user now, in the"
1346 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
958 ewarn "Avoid [\"'\\_%] characters in the password" 1347 ewarn "Avoid [\"'\\_%] characters in the password"
959 read -rsp " >" pwd1 ; echo 1348 read -rsp " >" pwd1 ; echo
960 1349
961 einfo "Retype the password" 1350 einfo "Retype the password"
962 read -rsp " >" pwd2 ; echo 1351 read -rsp " >" pwd2 ; echo
963 1352
964 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1353 if [[ "x$pwd1" != "x$pwd2" ]] ; then
965 die "Passwords are not the same" 1354 die "Passwords are not the same"
1355 fi
1356 MYSQL_ROOT_PASSWORD="${pwd1}"
1357 unset pwd1 pwd2
966 fi 1358 fi
967 1359
968 local options="" 1360 local options=""
969 local sqltmp="$(emktemp)" 1361 local sqltmp="$(emktemp)"
970 1362
984 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1376 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
985 || die "MySQL databases not installed" 1377 || die "MySQL databases not installed"
986 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1378 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
987 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1379 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
988 1380
1381 # Figure out which options we need to disable to do the setup
1382 helpfile="${TMPDIR}/mysqld-help"
1383 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1384 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1385 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1386 ndbcluster \
1387 ; do
1388 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1389 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1390 done
1391 # But some options changed names
1392 egrep -sq external-locking "${helpfile}" && \
1393 options="${options/skip-locking/skip-external-locking}"
1394
989 if mysql_version_is_at_least "4.1.3" ; then 1395 if mysql_version_is_at_least "4.1.3" ; then
990 options="--skip-ndbcluster"
991
992 # Filling timezones, see 1396 # Filling timezones, see
993 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1397 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
994 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1398 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
995 1399
996 if [[ -r "${help_tables}" ]] ; then 1400 if [[ -r "${help_tables}" ]] ; then
997 cat "${help_tables}" >> "${sqltmp}" 1401 cat "${help_tables}" >> "${sqltmp}"
998 fi 1402 fi
999 fi 1403 fi
1404
1405 einfo "Creating the mysql database and setting proper"
1406 einfo "permissions on it ..."
1000 1407
1001 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1408 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1002 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1409 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1003 local mysqld="${ROOT}/usr/sbin/mysqld \ 1410 local mysqld="${ROOT}/usr/sbin/mysqld \
1004 ${options} \ 1411 ${options} \
1005 --user=mysql \ 1412 --user=mysql \
1006 --skip-grant-tables \
1007 --basedir=${ROOT}/usr \ 1413 --basedir=${ROOT}/usr \
1008 --datadir=${ROOT}/${MY_DATADIR} \ 1414 --datadir=${ROOT}/${MY_DATADIR} \
1009 --skip-innodb \
1010 --skip-bdb \
1011 --skip-networking \
1012 --max_allowed_packet=8M \ 1415 --max_allowed_packet=8M \
1013 --net_buffer_length=16K \ 1416 --net_buffer_length=16K \
1417 --default-storage-engine=MyISAM \
1014 --socket=${socket} \ 1418 --socket=${socket} \
1015 --pid-file=${pidfile}" 1419 --pid-file=${pidfile}"
1420 #einfo "About to start mysqld: ${mysqld}"
1421 ebegin "Starting mysqld"
1016 ${mysqld} & 1422 ${mysqld} &
1423 rc=$?
1017 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1424 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1018 maxtry=$((${maxtry}-1)) 1425 maxtry=$((${maxtry}-1))
1019 echo -n "." 1426 echo -n "."
1020 sleep 1 1427 sleep 1
1021 done 1428 done
1429 eend $rc
1022 1430
1431 if ! [[ -S "${socket}" ]]; then
1432 die "Completely failed to start up mysqld with: ${mysqld}"
1433 fi
1434
1435 ebegin "Setting root password"
1023 # Do this from memory, as we don't want clear text passwords in temp files 1436 # Do this from memory, as we don't want clear text passwords in temp files
1024 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1437 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1025 "${ROOT}/usr/bin/mysql" \ 1438 "${ROOT}/usr/bin/mysql" \
1026 --socket=${socket} \ 1439 --socket=${socket} \
1027 -hlocalhost \ 1440 -hlocalhost \
1028 -e "${sql}" 1441 -e "${sql}"
1442 eend $?
1029 1443
1030 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1444 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1031
1032 "${ROOT}/usr/bin/mysql" \ 1445 "${ROOT}/usr/bin/mysql" \
1033 --socket=${socket} \ 1446 --socket=${socket} \
1034 -hlocalhost \ 1447 -hlocalhost \
1035 -uroot \ 1448 -uroot \
1036 -p"${pwd1}" \ 1449 -p"${MYSQL_ROOT_PASSWORD}" \
1037 mysql < "${sqltmp}" 1450 mysql < "${sqltmp}"
1451 rc=$?
1452 eend $?
1453 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1038 1454
1039 # Stop the server and cleanup 1455 # Stop the server and cleanup
1456 einfo "Stopping the server ..."
1040 kill $(< "${pidfile}" ) 1457 kill $(< "${pidfile}" )
1041 rm -f "${sqltmp}" 1458 rm -f "${sqltmp}"
1042 einfo "Stopping the server ..."
1043 wait %1 1459 wait %1
1044 einfo "Done" 1460 einfo "Done"
1045} 1461}
1046 1462
1047# @FUNCTION: mysql_pkg_postrm 1463# @FUNCTION: mysql_pkg_postrm

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

  ViewVC Help
Powered by ViewVC 1.1.20