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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.151

  ViewVC Help
Powered by ViewVC 1.1.20