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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.155

  ViewVC Help
Powered by ViewVC 1.1.20