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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.144

  ViewVC Help
Powered by ViewVC 1.1.20