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

Diff of /eclass/mysql.eclass

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

Revision 1.114 Revision 1.152
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.114 2009/07/06 19:06:03 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.152 2010/10/06 00:13:11 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
402 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 576 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
577 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
578 myconf="${myconf} $(use_enable community community-features)"
579 if use community; then
580 myconf="${myconf} $(use_enable profiling)"
581 else
582 myconf="${myconf} --disable-profiling"
583 fi
584 fi
585
586 # Scan for all available plugins
587 local plugins_avail="$(
588 LANG=C \
589 find "${S}" \
590 \( \
591 -name 'plug.in' \
592 -o -iname 'configure.in' \
593 -o -iname 'configure.ac' \
594 \) \
595 -print0 \
596 | xargs -0 sed -r -n \
597 -e '/^MYSQL_STORAGE_ENGINE/{
598 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
599 s~^([^ ]+).*~\1~gp;
600 }' \
601 | tr -s '\n' ' '
602 )"
403 603
404 # 5.1 introduces a new way to manage storage engines (plugins) 604 # 5.1 introduces a new way to manage storage engines (plugins)
405 # like configuration=none 605 # like configuration=none
606 # This base set are required, and will always be statically built.
406 local plugins="csv,myisam,myisammrg,heap" 607 local plugins_sta="csv myisam myisammrg heap"
608 local plugins_dyn=""
609 local plugins_dis="example ibmdb2i"
610
611 # These aren't actually required by the base set, but are really useful:
612 plugins_sta="${plugins_sta} archive blackhole"
613
614 # default in 5.5.4
615 if mysql_version_is_at_least "5.5.4" ; then
616 plugins_sta="${plugins_sta} partition"
617 fi
618 # Now the extras
407 if use extraengine ; then 619 if use extraengine ; then
408 # like configuration=max-no-ndb, archive and example removed in 5.1.11 620 # like configuration=max-no-ndb, archive and example removed in 5.1.11
409 plugins="${plugins},archive,blackhole,example,federated,partition" 621 # not added yet: ibmdb2i
622 # Not supporting as examples: example,daemon_example,ftexample
623 plugins_sta="${plugins_sta} partition"
624 plugins_dyn="${plugins_sta} federated"
410 625
626 if [[ "${PN}" != "mariadb" ]] ; then
411 elog "Before using the Federated storage engine, please be sure to read" 627 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" 628 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
629 else
630 elog "MariaDB includes the FederatedX engine. Be sure to read"
631 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
413 fi 632 fi
633 else
634 plugins_dis="${plugins_dis} partition federated"
635 fi
414 636
415 # Upstream specifically requests that InnoDB always be built. 637 # Upstream specifically requests that InnoDB always be built:
416 plugins="${plugins},innobase" 638 # - innobase, innodb_plugin
639 # Build falcon if available for 6.x series.
640 for i in innobase falcon ; do
641 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
642 done
643 for i in innodb_plugin ; do
644 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
645 done
417 646
418 # like configuration=max-no-ndb 647 # like configuration=max-no-ndb
419 if use cluster ; then 648 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
420 plugins="${plugins},ndbcluster" 649 plugins_sta="${plugins_sta} ndbcluster partition"
650 plugins_dis="${plugins_dis//partition}"
421 myconf="${myconf} --with-ndb-binlog" 651 myconf="${myconf} --with-ndb-binlog"
652 else
653 plugins_dis="${plugins_dis} ndbcluster"
422 fi 654 fi
423 655
424 if mysql_version_is_at_least "5.2" ; then 656 if [[ "${PN}" == "mariadb" ]] ; then
425 plugins="${plugins},falcon" 657 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
426 fi 658 # caught above.
659 plugins_sta="${plugins_sta} maria"
427 660
661 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
662 die "The ${P} package doesn't provide innobase nor xtradb"
663
664 for i in innobase xtradb ; do
665 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
666 done
667
668 myconf="${myconf} $(use_with libevent)"
669 # This is not optional, without it several upstream testcases fail.
670 # Also strongly recommended by upstream.
671 myconf="${myconf} --with-maria-tmp-tables"
672 fi
673
674 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
675 use pbxt \
676 && plugins_dyn="${plugins_dyn} pbxt" \
677 || plugins_dis="${plugins_dis} pbxt"
678 fi
679
680 use static && \
681 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
682 plugins_dyn=""
683
684 einfo "Available plugins: ${plugins_avail}"
685 einfo "Dynamic plugins: ${plugins_dyn}"
686 einfo "Static plugins: ${plugins_sta}"
687 einfo "Disabled plugins: ${plugins_dis}"
688
689 # These are the static plugins
428 myconf="${myconf} --with-plugins=${plugins}" 690 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
691 # And the disabled ones
692 for i in ${plugins_dis} ; do
693 myconf="${myconf} --without-plugin-${i}"
694 done
429} 695}
430 696
431pbxt_src_configure() { 697pbxt_src_configure() {
432 mysql_init_vars 698 mysql_init_vars
433 699
434 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 700 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
435 701
436 einfo "Reconfiguring dir '${PWD}'" 702 einfo "Reconfiguring dir '${PWD}'"
437 AT_GNUCONF_UPDATE="yes" eautoreconf 703 eautoreconf
438 704
439 local myconf="" 705 local myconf=""
440 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 706 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
441 use debug && myconf="${myconf} --with-debug=full" 707 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" 708 econf ${myconf} || die "Problem configuring PBXT storage engine"
444} 709}
445 710
446pbxt_src_compile() { 711pbxt_src_compile() {
712
447 # Be backwards compatible for now 713 # Be backwards compatible for now
448 if [[ $EAPI != 2 ]]; then 714 if [[ $EAPI != 2 ]]; then
449 pbxt_src_configure 715 pbxt_src_configure
450 fi 716 fi
451 # TODO: is it safe/needed to use emake here ? 717 # TODO: is it safe/needed to use emake here ?
455 # TODO: modify test suite for PBXT 721 # TODO: modify test suite for PBXT
456} 722}
457 723
458pbxt_src_install() { 724pbxt_src_install() {
459 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 725 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
460 make install || die "Failed to install PBXT" 726 emake install DESTDIR="${D}" || die "Failed to install PBXT"
461 popd 727 popd
462} 728}
463 729
464# 730#
465# EBUILD FUNCTIONS 731# EBUILD FUNCTIONS
466# 732#
733# @FUNCTION: mysql_pkg_setup
734# @DESCRIPTION:
735# Perform some basic tests and tasks during pkg_setup phase:
736# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
737# check for conflicting use flags
738# create new user and group for mysql
739# warn about deprecated features
467mysql_pkg_setup() { 740mysql_pkg_setup() {
468 if hasq test ${FEATURES} ; then 741 if hasq test ${FEATURES} ; then
469 if ! use minimal ; then 742 if ! use minimal ; then
470 if [[ $UID -eq 0 ]]; then 743 if [[ $UID -eq 0 ]]; then
471 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 744 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
473 fi 746 fi
474 fi 747 fi
475 748
476 # Check for USE flag problems in pkg_setup 749 # Check for USE flag problems in pkg_setup
477 if use static && use ssl ; then 750 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!" 751 M="MySQL does not support being built statically with SSL support enabled!"
752 eerror "${M}"
753 die "${M}"
480 fi 754 fi
481 755
482 if ! mysql_version_is_at_least "5.0" \ 756 if ! mysql_version_is_at_least "5.0" \
483 && use raid \ 757 && use raid \
484 && use static ; then 758 && use static ; then
486 eerror "with RAID support enabled." 760 eerror "with RAID support enabled."
487 die "USE flags 'raid' and 'static' conflict!" 761 die "USE flags 'raid' and 'static' conflict!"
488 fi 762 fi
489 763
490 if mysql_version_is_at_least "4.1.3" \ 764 if mysql_version_is_at_least "4.1.3" \
491 && ( use cluster || use extraengine ) \ 765 && ( use cluster || use extraengine || use embedded ) \
492 && use minimal ; then 766 && 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!" 767 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
768 eerror "${M}"
769 die "${M}"
770 fi
771
772 if mysql_version_is_at_least "5.1" \
773 && xtradb_patch_available \
774 && use xtradb \
775 && use embedded ; then
776 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
777 eerror "${M}"
778 die "${M}"
779 fi
780
781 # Bug #290570, 284946, 307251
782 # Upstream changes made us need a fairly new GCC4.
783 # But only for 5.0.8[3-6]!
784 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
785 GCC_VER=$(gcc-version)
786 case ${GCC_VER} in
787 2*|3*|4.0|4.1|4.2)
788 eerror "Some releases of MySQL required a very new GCC, and then"
789 eerror "later release relaxed that requirement again. Either pick a"
790 eerror "MySQL >=5.0.87, or use a newer GCC."
791 die "Active GCC too old!" ;;
792 esac
495 fi 793 fi
496 794
497 # This should come after all of the die statements 795 # This should come after all of the die statements
498 enewgroup mysql 60 || die "problem adding 'mysql' group" 796 enewgroup mysql 60 || die "problem adding 'mysql' group"
499 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 797 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
500 798
501 mysql_check_version_range "4.0 to 5.0.99.99" \ 799 mysql_check_version_range "4.0 to 5.0.99.99" \
502 && use berkdb \ 800 && use berkdb \
503 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 801 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
504}
505 802
803 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
804 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
805 ewarn "5.1 series should NOT be put into production. In the near"
806 ewarn "future, it will be disabled from building."
807 ewarn ""
808 ewarn "If you need NDB support, you should instead move to the new"
809 ewarn "mysql-cluster package that represents that upstream NDB"
810 ewarn "development."
811 fi
812}
813
814# @FUNCTION: mysql_src_unpack
815# @DESCRIPTION:
816# Unpack the source code and call mysql_src_prepare for EAPI < 2.
506mysql_src_unpack() { 817mysql_src_unpack() {
507 # Initialize the proper variables first 818 # Initialize the proper variables first
508 mysql_init_vars 819 mysql_init_vars
509 820
510 unpack ${A} 821 unpack ${A}
511 # Grab the patches 822 # Grab the patches
512 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack 823 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
513 824
514 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 825 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
515 826
516 # Be backwards compatible for now 827 # Be backwards compatible for now
517 if [[ $EAPI != 2 ]]; then 828 case ${EAPI:-0} in
518 mysql_src_prepare 829 2) : ;;
519 fi 830 0 | 1) mysql_src_prepare ;;
831 esac
520} 832}
521 833
834# @FUNCTION: mysql_src_prepare
835# @DESCRIPTION:
836# Apply patches to the source code and remove unneeded bundled libs.
522mysql_src_prepare() { 837mysql_src_prepare() {
523 cd "${S}" 838 cd "${S}"
524 839
525 # Apply the patches for this MySQL version 840 # Apply the patches for this MySQL version
526 EPATCH_SUFFIX="patch" 841 EPATCH_SUFFIX="patch"
530 # Now link in right patches 845 # Now link in right patches
531 mysql_mv_patches 846 mysql_mv_patches
532 # And apply 847 # And apply
533 epatch 848 epatch
534 849
535 # Additional checks, remove bundled zlib 850 # last -fPIC fixup, per bug #305873
851 i="${S}"/storage/innodb_plugin/plug.in
852 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
853
854 # Additional checks, remove bundled zlib (Cluster needs this, for static
855 # memory management in zlib, leave available for Cluster)
856 if [[ "${PN}" != "mysql-cluster" ]] ; then
536 rm -f "${S}/zlib/"*.[ch] 857 rm -f "${S}/zlib/"*.[ch]
537 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 858 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
859 fi
538 rm -f "scripts/mysqlbug" 860 rm -f "scripts/mysqlbug"
539 861
540 # Make charsets install in the right place 862 # Make charsets install in the right place
541 find . -name 'Makefile.am' \ 863 find . -name 'Makefile.am' \
542 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 864 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
543 865
544 if mysql_version_is_at_least "4.1" ; then 866 if mysql_version_is_at_least "4.1" ; then
545 # Remove what needs to be recreated, so we're sure it's actually done 867 # Remove what needs to be recreated, so we're sure it's actually done
868 einfo "Cleaning up old buildscript files"
546 find . -name Makefile \ 869 find . -name Makefile \
547 -o -name Makefile.in \ 870 -o -name Makefile.in \
548 -o -name configure \ 871 -o -name configure \
549 -exec rm -f {} \; 872 -exec rm -f {} \;
550 rm -f "ltmain.sh" 873 rm -f "ltmain.sh"
551 rm -f "scripts/mysqlbug" 874 rm -f "scripts/mysqlbug"
552 fi 875 fi
553 876
554 local rebuilddirlist d 877 local rebuilddirlist d
555 878
879 if xtradb_patch_available && use xtradb ; then
880 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
881 pushd "${S}"/storage >/dev/null
882 i="innobase"
883 o="${WORKDIR}/storage-${i}.mysql-upstream"
884 # Have we been here already?
885 [ -d "${o}" ] && rm -f "${i}"
886 # Or maybe we haven't
887 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
888 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
889 popd >/dev/null
890 fi
891
892 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
893 einfo "Adding storage engine: PBXT"
894 pushd "${S}"/storage >/dev/null
895 i='pbxt'
896 [ -d "${i}" ] && rm -rf "${i}"
897 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
898 popd >/dev/null
899 fi
900
556 if mysql_version_is_at_least "5.1.12" ; then 901 if mysql_version_is_at_least "5.1.12" ; then
557 rebuilddirlist="." 902 rebuilddirlist="."
903 # This does not seem to be needed presently. robbat2 2010/02/23
904 #einfo "Updating innobase cmake"
558 # TODO: check this with a cmake expert 905 ## TODO: check this with a cmake expert
559 cmake \ 906 #cmake \
560 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 907 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
561 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 908 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
562 "storage/innobase" 909 # "storage/innobase"
563 else 910 else
564 rebuilddirlist=". innobase" 911 rebuilddirlist=". innobase"
565 fi 912 fi
566 913
567 for d in ${rebuilddirlist} ; do 914 for d in ${rebuilddirlist} ; do
568 einfo "Reconfiguring dir '${d}'" 915 einfo "Reconfiguring dir '${d}'"
569 pushd "${d}" &>/dev/null 916 pushd "${d}" &>/dev/null
570 AT_GNUCONF_UPDATE="yes" eautoreconf 917 eautoreconf
571 popd &>/dev/null 918 popd &>/dev/null
572 done 919 done
573 920
574 if mysql_check_version_range "4.1 to 5.0.99.99" \ 921 if mysql_check_version_range "4.1 to 5.0.99.99" \
575 && use berkdb ; then 922 && use berkdb ; then
923 einfo "Fixing up berkdb buildsystem"
576 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 924 [[ -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" \ 925 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
578 || die "Could not copy libtool.m4 to bdb/dist/" 926 || die "Could not copy libtool.m4 to bdb/dist/"
579 #These files exist only with libtool-2*, and need to be included. 927 #These files exist only with libtool-2*, and need to be included.
580 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 928 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
588 || die "Failed bdb reconfigure" 936 || die "Failed bdb reconfigure"
589 popd &>/dev/null 937 popd &>/dev/null
590 fi 938 fi
591} 939}
592 940
941# @FUNCTION: mysql_src_configure
942# @DESCRIPTION:
943# Configure mysql to build the code for Gentoo respecting the use flags.
593mysql_src_configure() { 944mysql_src_configure() {
594 # Make sure the vars are correctly initialized 945 # Make sure the vars are correctly initialized
595 mysql_init_vars 946 mysql_init_vars
596 947
597 # $myconf is modified by the configure_* functions 948 # $myconf is modified by the configure_* functions
623 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 974 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
624 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 975 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
625 mysql_version_is_at_least "5.0" \ 976 mysql_version_is_at_least "5.0" \
626 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 977 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
627 export CXXFLAGS 978 export CXXFLAGS
979
980 # bug #283926, with GCC4.4, this is required to get correct behavior.
981 append-flags -fno-strict-aliasing
628 982
629 econf \ 983 econf \
630 --libexecdir="/usr/sbin" \ 984 --libexecdir="/usr/sbin" \
631 --sysconfdir="${MY_SYSCONFDIR}" \ 985 --sysconfdir="${MY_SYSCONFDIR}" \
632 --localstatedir="${MY_LOCALSTATEDIR}" \ 986 --localstatedir="${MY_LOCALSTATEDIR}" \
643 # TODO: Move this before autoreconf !!! 997 # TODO: Move this before autoreconf !!!
644 find . -type f -name Makefile -print0 \ 998 find . -type f -name Makefile -print0 \
645 | xargs -0 -n100 sed -i \ 999 | xargs -0 -n100 sed -i \
646 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1000 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
647 1001
648 if [[ $EAPI == 2 ]]; then 1002 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
649 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 1003 pbxt_patch_available && use pbxt && pbxt_src_configure
650 fi 1004 fi
651} 1005}
652 1006
1007# @FUNCTION: mysql_src_compile
1008# @DESCRIPTION:
1009# Compile the mysql code.
653mysql_src_compile() { 1010mysql_src_compile() {
654 # Be backwards compatible for now 1011 # Be backwards compatible for now
655 if [[ $EAPI != 2 ]]; then 1012 case ${EAPI:-0} in
1013 2) : ;;
656 mysql_src_configure 1014 0 | 1) mysql_src_configure ;;
657 fi 1015 esac
658 1016
659 emake || die "emake failed" 1017 emake || die "emake failed"
660 1018
661 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 1019 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1020 pbxt_patch_available && use pbxt && pbxt_src_compile
1021 fi
662} 1022}
663 1023
1024# @FUNCTION: mysql_src_install
1025# @DESCRIPTION:
1026# Install mysql.
664mysql_src_install() { 1027mysql_src_install() {
665 # Make sure the vars are correctly initialized 1028 # Make sure the vars are correctly initialized
666 mysql_init_vars 1029 mysql_init_vars
667 1030
668 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 1031 emake install \
1032 DESTDIR="${D}" \
1033 benchdir_root="${MY_SHAREDSTATEDIR}" \
1034 testroot="${MY_SHAREDSTATEDIR}" \
1035 || die "emake install failed"
669 1036
670 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 1037 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1038 pbxt_patch_available && use pbxt && pbxt_src_install
1039 fi
671 1040
672 # Convenience links 1041 # Convenience links
673 einfo "Making Convenience links for mysqlcheck multi-call binary" 1042 einfo "Making Convenience links for mysqlcheck multi-call binary"
674 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1043 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
675 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1044 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
679 einfo "Removing duplicate /usr/share/mysql files" 1048 einfo "Removing duplicate /usr/share/mysql files"
680 rm -Rf "${D}/usr/share/info" 1049 rm -Rf "${D}/usr/share/info"
681 for removeme in "mysql-log-rotate" mysql.server* \ 1050 for removeme in "mysql-log-rotate" mysql.server* \
682 binary-configure* my-*.cnf mi_test_all* 1051 binary-configure* my-*.cnf mi_test_all*
683 do 1052 do
684 rm -f "${D}"/usr/share/mysql/${removeme} 1053 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
685 done 1054 done
686 1055
687 # Clean up stuff for a minimal build 1056 # Clean up stuff for a minimal build
688 if use minimal ; then 1057 if use minimal ; then
689 einfo "Remove all extra content for minimal build" 1058 einfo "Remove all extra content for minimal build"
691 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 1060 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
692 rm -f "${D}/usr/sbin/mysqld" 1061 rm -f "${D}/usr/sbin/mysqld"
693 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1062 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
694 fi 1063 fi
695 1064
1065 # Unless they explicitly specific USE=test, then do not install the
1066 # testsuite. It DOES have a use to be installed, esp. when you want to do a
1067 # validation of your database configuration after tuning it.
1068 if use !test ; then
1069 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
1070 fi
1071
696 # Configuration stuff 1072 # Configuration stuff
697 if mysql_version_is_at_least "4.1" ; then 1073 case ${MYSQL_PV_MAJOR} in
698 mysql_mycnf_version="4.1"
699 else
700 mysql_mycnf_version="4.0" 1074 3*|4.0) mysql_mycnf_version="4.0" ;;
701 fi 1075 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
702 einfo "Building default my.cnf" 1076 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1077 esac
1078 einfo "Building default my.cnf (${mysql_mycnf_version})"
703 insinto "${MY_SYSCONFDIR}" 1079 insinto "${MY_SYSCONFDIR}"
704 doins scripts/mysqlaccess.conf 1080 doins scripts/mysqlaccess.conf
1081 mycnf_src="my.cnf-${mysql_mycnf_version}"
705 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1082 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
706 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1083 "${FILESDIR}/${mycnf_src}" \
707 > "${TMPDIR}/my.cnf.ok" 1084 > "${TMPDIR}/my.cnf.ok"
708 if mysql_version_is_at_least "4.1" && use latin1 ; then 1085 if use latin1 ; then
709 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 1086 sed -i \
1087 -e "/character-set/s|utf8|latin1|g" \
1088 "${TMPDIR}/my.cnf.ok"
710 fi 1089 fi
711 newins "${TMPDIR}/my.cnf.ok" my.cnf 1090 newins "${TMPDIR}/my.cnf.ok" my.cnf
712 1091
713 # Minimal builds don't have the MySQL server 1092 # Minimal builds don't have the MySQL server
714 if ! use minimal ; then 1093 if ! use minimal ; then
729 done 1108 done
730 fi 1109 fi
731 1110
732 # Docs 1111 # Docs
733 einfo "Installing docs" 1112 einfo "Installing docs"
734 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1113 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
735 doinfo "${S}"/Docs/mysql.info 1114 doinfo "${S}"/Docs/mysql.info
736 1115
737 # Minimal builds don't have the MySQL server 1116 # Minimal builds don't have the MySQL server
738 if ! use minimal ; then 1117 if ! use minimal ; then
739 einfo "Including support files and sample configurations" 1118 einfo "Including support files and sample configurations"
741 for script in \ 1120 for script in \
742 "${S}"/support-files/my-*.cnf \ 1121 "${S}"/support-files/my-*.cnf \
743 "${S}"/support-files/magic \ 1122 "${S}"/support-files/magic \
744 "${S}"/support-files/ndb-config-2-node.ini 1123 "${S}"/support-files/ndb-config-2-node.ini
745 do 1124 do
746 dodoc "${script}" 1125 [[ -f "$script" ]] && dodoc "${script}"
747 done 1126 done
748 1127
749 docinto "scripts" 1128 docinto "scripts"
750 for script in "${S}"/scripts/mysql* ; do 1129 for script in "${S}"/scripts/mysql* ; do
751 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1130 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
752 done 1131 done
753 1132
754 fi 1133 fi
755 1134
756 mysql_lib_symlinks "${D}" 1135 mysql_lib_symlinks "${D}"
757} 1136}
758 1137
1138# @FUNCTION: mysql_pkg_preinst
1139# @DESCRIPTION:
1140# Create the user and groups for mysql - die if that fails.
759mysql_pkg_preinst() { 1141mysql_pkg_preinst() {
760 enewgroup mysql 60 || die "problem adding 'mysql' group" 1142 enewgroup mysql 60 || die "problem adding 'mysql' group"
761 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 1143 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
762} 1144}
763 1145
1146# @FUNCTION: mysql_pkg_postinst
1147# @DESCRIPTION:
1148# Run post-installation tasks:
1149# create the dir for logfiles if non-existant
1150# touch the logfiles and secure them
1151# install scripts
1152# issue required steps for optional features
1153# issue deprecation warnings
764mysql_pkg_postinst() { 1154mysql_pkg_postinst() {
765 # Make sure the vars are correctly initialized 1155 # Make sure the vars are correctly initialized
766 mysql_init_vars 1156 mysql_init_vars
767 1157
768 # Check FEATURES="collision-protect" before removing this 1158 # Check FEATURES="collision-protect" before removing this
779 for script in \ 1169 for script in \
780 support-files/my-*.cnf \ 1170 support-files/my-*.cnf \
781 support-files/magic \ 1171 support-files/magic \
782 support-files/ndb-config-2-node.ini 1172 support-files/ndb-config-2-node.ini
783 do 1173 do
1174 [[ -f "${script}" ]] \
784 dodoc "${script}" 1175 && dodoc "${script}"
785 done 1176 done
786 1177
787 docinto "scripts" 1178 docinto "scripts"
788 for script in scripts/mysql* ; do 1179 for script in scripts/mysql* ; do
1180 [[ -f "${script}" ]] \
789 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1181 && [[ "${script%.sh}" == "${script}" ]] \
1182 && dodoc "${script}"
790 done 1183 done
791 1184
792 einfo 1185 einfo
793 elog "You might want to run:" 1186 elog "You might want to run:"
794 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1187 elog "\"emerge --config =${CATEGORY}/${PF}\""
795 elog "if this is a new install." 1188 elog "if this is a new install."
796 einfo 1189 einfo
797 fi
798 1190
799 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 1191 einfo
1192 elog "If you are upgrading major versions, you should run the"
1193 elog "mysql_upgrade tool."
1194 einfo
1195 fi
1196
1197 if pbxt_available && use pbxt ; then
800 # TODO: explain it better 1198 # TODO: explain it better
801 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1199 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
802 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1200 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
803 elog "if, after that, you cannot start the MySQL server," 1201 elog "if, after that, you cannot start the MySQL server,"
804 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1202 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
814 mysql_check_version_range "4.0 to 5.0.99.99" \ 1212 mysql_check_version_range "4.0 to 5.0.99.99" \
815 && use berkdb \ 1213 && use berkdb \
816 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 1214 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
817} 1215}
818 1216
1217# @FUNCTION: mysql_pkg_config
1218# @DESCRIPTION:
1219# Configure mysql environment.
819mysql_pkg_config() { 1220mysql_pkg_config() {
820 local old_MY_DATADIR="${MY_DATADIR}" 1221 local old_MY_DATADIR="${MY_DATADIR}"
821 1222
822 # Make sure the vars are correctly initialized 1223 # Make sure the vars are correctly initialized
823 mysql_init_vars 1224 mysql_init_vars
846 if [[ -d "${MY_DATADIR_s}" ]]; then 1247 if [[ -d "${MY_DATADIR_s}" ]]; then
847 ewarn "Attempting to use ${MY_DATADIR_s}" 1248 ewarn "Attempting to use ${MY_DATADIR_s}"
848 else 1249 else
849 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" 1250 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
850 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" 1251 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
851 fi 1252 fi
852 fi 1253 fi
853 fi 1254 fi
854 1255
855 local pwd1="a" 1256 local pwd1="a"
856 local pwd2="b" 1257 local pwd2="b"
1258 local MYSQL_ROOT_PASSWORD=''
857 local maxtry=5 1259 local maxtry=15
1260
1261 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1262 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1263 fi
858 1264
859 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1265 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
860 ewarn "You have already a MySQL database in place." 1266 ewarn "You have already a MySQL database in place."
861 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1267 ewarn "(${ROOT}/${MY_DATADIR}/*)"
862 ewarn "Please rename or delete it if you wish to replace it." 1268 ewarn "Please rename or delete it if you wish to replace it."
865 1271
866 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1272 # Bug #213475 - MySQL _will_ object strenously if your machine is named
867 # localhost. Also causes weird failures. 1273 # localhost. Also causes weird failures.
868 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1274 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
869 1275
870 einfo "Creating the mysql database and setting proper" 1276 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
871 einfo "permissions on it ..."
872 1277
873 einfo "Insert a password for the mysql 'root' user" 1278 einfo "Please provide a password for the mysql 'root' user now,"
1279 einfo "or in the MYSQL_ROOT_PASSWORD env var."
874 ewarn "Avoid [\"'\\_%] characters in the password" 1280 ewarn "Avoid [\"'\\_%] characters in the password"
875 read -rsp " >" pwd1 ; echo 1281 read -rsp " >" pwd1 ; echo
876 1282
877 einfo "Retype the password" 1283 einfo "Retype the password"
878 read -rsp " >" pwd2 ; echo 1284 read -rsp " >" pwd2 ; echo
879 1285
880 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1286 if [[ "x$pwd1" != "x$pwd2" ]] ; then
881 die "Passwords are not the same" 1287 die "Passwords are not the same"
1288 fi
1289 MYSQL_ROOT_PASSWORD="${pwd1}"
1290 unset pwd1 pwd2
882 fi 1291 fi
883 1292
884 local options="" 1293 local options=""
885 local sqltmp="$(emktemp)" 1294 local sqltmp="$(emktemp)"
886 1295
900 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1309 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
901 || die "MySQL databases not installed" 1310 || die "MySQL databases not installed"
902 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1311 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
903 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1312 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
904 1313
1314 # Figure out which options we need to disable to do the setup
1315 helpfile="${TMPDIR}/mysqld-help"
1316 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1317 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1318 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1319 ndbcluster \
1320 ; do
1321 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1322 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1323 done
1324 # But some options changed names
1325 egrep -sq external-locking "${helpfile}" && \
1326 options="${options/skip-locking/skip-external-locking}"
1327
905 if mysql_version_is_at_least "4.1.3" ; then 1328 if mysql_version_is_at_least "4.1.3" ; then
906 options="--skip-ndbcluster"
907
908 # Filling timezones, see 1329 # Filling timezones, see
909 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1330 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
910 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1331 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
911 1332
912 if [[ -r "${help_tables}" ]] ; then 1333 if [[ -r "${help_tables}" ]] ; then
913 cat "${help_tables}" >> "${sqltmp}" 1334 cat "${help_tables}" >> "${sqltmp}"
914 fi 1335 fi
915 fi 1336 fi
1337
1338 einfo "Creating the mysql database and setting proper"
1339 einfo "permissions on it ..."
916 1340
917 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1341 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
918 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1342 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
919 local mysqld="${ROOT}/usr/sbin/mysqld \ 1343 local mysqld="${ROOT}/usr/sbin/mysqld \
920 ${options} \ 1344 ${options} \
921 --user=mysql \ 1345 --user=mysql \
922 --skip-grant-tables \
923 --basedir=${ROOT}/usr \ 1346 --basedir=${ROOT}/usr \
924 --datadir=${ROOT}/${MY_DATADIR} \ 1347 --datadir=${ROOT}/${MY_DATADIR} \
925 --skip-innodb \
926 --skip-bdb \
927 --skip-networking \
928 --max_allowed_packet=8M \ 1348 --max_allowed_packet=8M \
929 --net_buffer_length=16K \ 1349 --net_buffer_length=16K \
1350 --default-storage-engine=MyISAM \
930 --socket=${socket} \ 1351 --socket=${socket} \
931 --pid-file=${pidfile}" 1352 --pid-file=${pidfile}"
1353 #einfo "About to start mysqld: ${mysqld}"
1354 ebegin "Starting mysqld"
932 ${mysqld} & 1355 ${mysqld} &
1356 rc=$?
933 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1357 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
934 maxtry=$((${maxtry}-1)) 1358 maxtry=$((${maxtry}-1))
935 echo -n "." 1359 echo -n "."
936 sleep 1 1360 sleep 1
937 done 1361 done
1362 eend $rc
938 1363
1364 if ! [[ -S "${socket}" ]]; then
1365 die "Completely failed to start up mysqld with: ${mysqld}"
1366 fi
1367
1368 ebegin "Setting root password"
939 # Do this from memory, as we don't want clear text passwords in temp files 1369 # Do this from memory, as we don't want clear text passwords in temp files
940 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1370 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
941 "${ROOT}/usr/bin/mysql" \ 1371 "${ROOT}/usr/bin/mysql" \
942 --socket=${socket} \ 1372 --socket=${socket} \
943 -hlocalhost \ 1373 -hlocalhost \
944 -e "${sql}" 1374 -e "${sql}"
1375 eend $?
945 1376
946 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1377 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
947
948 "${ROOT}/usr/bin/mysql" \ 1378 "${ROOT}/usr/bin/mysql" \
949 --socket=${socket} \ 1379 --socket=${socket} \
950 -hlocalhost \ 1380 -hlocalhost \
951 -uroot \ 1381 -uroot \
952 -p"${pwd1}" \ 1382 -p"${MYSQL_ROOT_PASSWORD}" \
953 mysql < "${sqltmp}" 1383 mysql < "${sqltmp}"
1384 rc=$?
1385 eend $?
1386 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
954 1387
955 # Stop the server and cleanup 1388 # Stop the server and cleanup
1389 einfo "Stopping the server ..."
956 kill $(< "${pidfile}" ) 1390 kill $(< "${pidfile}" )
957 rm -f "${sqltmp}" 1391 rm -f "${sqltmp}"
958 einfo "Stopping the server ..."
959 wait %1 1392 wait %1
960 einfo "Done" 1393 einfo "Done"
961} 1394}
962 1395
1396# @FUNCTION: mysql_pkg_postrm
1397# @DESCRIPTION:
1398# Remove mysql symlinks.
963mysql_pkg_postrm() { 1399mysql_pkg_postrm() {
964 : # mysql_lib_symlinks "${D}" 1400 : # mysql_lib_symlinks "${D}"
965} 1401}

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

  ViewVC Help
Powered by ViewVC 1.1.20