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

Diff of /eclass/mysql.eclass

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

Revision 1.58 Revision 1.156
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.58 2007/01/04 20:38:16 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
4# kate: encoding utf-8; eol unix;
5# kate: indent-width 4; mixedindent off; remove-trailing-space on; space-indent off;
6# kate: word-wrap-column 80; word-wrap off;
7 4
5# @ECLASS: mysql.eclass
6# @MAINTAINER:
8# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
9# Maintainer: Luca Longinotti <chtekk@gentoo.org> 9# - Luca Longinotti <chtekk@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.
10 17
11# Note that MYSQL_VERSION_ID must be empty !!! 18WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest"
12 20
13ECLASS="mysql"
14INHERITED="$INHERITED $ECLASS"
15inherit eutils flag-o-matic gnuconfig autotools mysql_fx 21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
16 22
17# avoid running userspace code 8 times per ebuild :( 23# Shorten the path because the socket path length must be shorter than 107 chars
18if [[ "${_MYPVR}" != "${PVR}" ]] && [[ -n "${PVR}" ]] 24# and we will run a mysql server during test phase
19then 25S="${WORKDIR}/mysql"
20 _MYPVR=${PVR}
21 26
22 [[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070104" 27[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
23 28if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
24 if [[ ${PR#r} -lt 60 ]] ; then 29 EGIT_PROJECT=mysql-extras
25 IS_BITKEEPER=0 30 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
26 elif [[ ${PR#r} -lt 90 ]] ; then 31 inherit git
27 IS_BITKEEPER=60
28 else
29 IS_BITKEEPER=90
30 fi 32fi
31 33
34case "${EAPI:-0}" in
35 2)
36 EXPORT_FUNCTIONS pkg_setup \
37 src_unpack src_prepare \
38 src_configure src_compile \
39 src_install \
40 pkg_preinst pkg_postinst \
41 pkg_config pkg_postrm
42 IUSE_DEFAULT_ON='+'
43 ;;
44 0 | 1)
45 EXPORT_FUNCTIONS pkg_setup \
46 src_unpack \
47 src_compile \
48 src_install \
49 pkg_preinst pkg_postinst \
50 pkg_config pkg_postrm
51 ;;
52 *)
53 die "Unsupported EAPI: ${EAPI}" ;;
54esac
55
56
57# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
58# @DESCRIPTION:
59# Upstream MySQL considers the first two parts of the version number to be the
60# major version. Upgrades that change major version should always run
61# mysql_upgrade.
62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
63
64# 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
69fi
70
71
72# @ECLASS-VARIABLE: MYSQL_VERSION_ID
73# @DESCRIPTION:
32 # MYSQL_VERSION_ID will be: 74# MYSQL_VERSION_ID will be:
33 # 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]
34 # 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
35 # depend on this variable. 77# depend on this variable.
36 # 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"
79# We also strip off upstream's trailing letter that they use to respin tarballs
80
37 MYSQL_VERSION_ID="" 81MYSQL_VERSION_ID=""
82tpv="${PV%[a-z]}"
38 tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 83tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
39 for vatom in 0 1 2 3 ; do 84for vatom in 0 1 2 3 ; do
40 # pad to length 2 85 # pad to length 2
41 tpv[${vatom}]="00${tpv[${vatom}]}" 86 tpv[${vatom}]="00${tpv[${vatom}]}"
42 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 87 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
43 done 88done
44 # 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)
45 MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 90MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
46 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).
96# Community features are available in mysql-community
97# AND in the re-merged mysql-5.0.82 and newer
98if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
99 MYSQL_COMMUNITY_FEATURES=1
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
111 MYSQL_COMMUNITY_FEATURES=1
112else
113 MYSQL_COMMUNITY_FEATURES=0
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}"
125
47 # Be warned, *DEPEND are version-dependant 126# Be warned, *DEPEND are version-dependant
127# These are used for both runtime and compiletime
48 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 128DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
49 userland_GNU? ( sys-process/procps ) 129 userland_GNU? ( sys-process/procps )
50 >=sys-apps/sed-4 130 >=sys-apps/sed-4
51 >=sys-apps/texinfo-4.7-r1 131 >=sys-apps/texinfo-4.7-r1
52 >=sys-libs/readline-4.1 132 >=sys-libs/readline-4.1
53 >=sys-libs/zlib-1.2.3 133 >=sys-libs/zlib-1.2.3"
54 "
55 134
135[[ "${PN}" == "mariadb" ]] \
136&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
137
56 # 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
57 for i in "" "-community" "-slotted" ; do 139for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
58 [[ "${i}" == ${PN#mysql} ]] || 140 [[ "${i}" == ${PN} ]] ||
59 DEPEND="${DEPEND} !dev-db/mysql${i}" 141 DEPEND="${DEPEND} !dev-db/${i}"
60 done 142done
61 143
144RDEPEND="${DEPEND}
145 !minimal? ( dev-db/mysql-init-scripts )
146 selinux? ( sec-policy/selinux-mysql )"
147
148# compile-time-only
62 mysql_version_is_at_least "5.1" \ 149mysql_version_is_at_least "5.1" \
63 || DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 150|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
64 151
152# compile-time-only
153mysql_version_is_at_least "5.1.12" \
154&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
155
65 # 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
66 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 157PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
67 158
68 if mysql_version_is_at_least "5.1.12" ; then 159# For other stuff to bring us in
69 DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 160PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
70 fi
71 161
72 # Shorten the path because the socket path length must be shorter than 107 chars 162# Work out the default SERVER_URI correctly
73 # and we will run a mysql server during test phase 163if [ -z "${SERVER_URI}" ]; then
74 S="${WORKDIR}/mysql" 164 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
75 165 if [ "${PN}" == "mariadb" ]; then
76 # BitKeeper dependency, compile-time only 166 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
77 [[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 167 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
78 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 "
176 # The community and cluster builds are on the mirrors
177 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
79 if [[ ${PN} == "mysql-slotted" ]] ; then 178 if [[ "${PN}" == "mysql-cluster" ]] ; then
80 DEPEND="${DEPEND} app-admin/eselect-mysql" 179 URI_DIR="MySQL-Cluster"
81 fi 180 URI_FILE="mysql-cluster-gpl"
82
83 if [[ ${PN} == "mysql-slotted" ]] ; then
84 SLOT=""
85 tpv=( ${PV//[-._]/ } )
86 for vatom in 0 1 2 ; do
87 SLOT="${SLOT}${tpv[${vatom}]}_"
88 done
89 #finally SLOT=5_0_24
90 SLOT=${SLOT:0:${#SLOT}-1}
91 else 181 else
92 SLOT="0" 182 URI_DIR="MySQL"
183 URI_FILE="mysql"
93 fi 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}"
190 # The (old) enterprise source is on the primary site only
191 elif [ "${PN}" == "mysql" ]; then
192 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
193 fi
194fi
94 195
95 # Define correct SRC_URIs 196# Define correct SRC_URIs
96 SRC_URI=" 197SRC_URI="${SERVER_URI}"
97 ${SERVER_URI} 198
199# Gentoo patches to MySQL
200[[ ${MY_EXTRAS_VER} != live ]] \
201&& SRC_URI="${SRC_URI}
202 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
98 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 203 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
99 " 204 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
100 mysql_version_is_at_least "5.1.12" \
101 && [[ -n "${PBXT_VERSION}" ]] \
102 && SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
103 205
104 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 206DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
105 HOMEPAGE="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
106 LICENSE="GPL-2" 215LICENSE="GPL-2"
216SLOT="0"
107 IUSE="big-tables debug embedded minimal perl selinux ssl static" 217IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
108 RESTRICT="confcache"
109 218
110 mysql_version_is_at_least "4.1" \ 219mysql_version_is_at_least "4.1" \
111 && IUSE="${IUSE} latin1" 220&& IUSE="${IUSE} latin1"
112 221
113 mysql_version_is_at_least "4.1.3" \ 222if mysql_version_is_at_least "4.1.3" ; then
114 && IUSE="${IUSE} cluster extraengine" 223 IUSE="${IUSE} extraengine"
224 if [[ "${PN}" != "mysql-cluster" ]] ; then
225 IUSE="${IUSE} cluster"
226 fi
227fi
115 228
116 mysql_version_is_at_least "5.0" \ 229mysql_version_is_at_least "5.0" \
117 || IUSE="${IUSE} raid" 230|| IUSE="${IUSE} raid"
118 231
119 mysql_version_is_at_least "5.0.18" \ 232mysql_version_is_at_least "5.0.18" \
120 && IUSE="${IUSE} max-idx-128" 233&& IUSE="${IUSE} max-idx-128"
121 234
122 mysql_version_is_at_least "5.1" \ 235mysql_version_is_at_least "5.1" \
123 && IUSE="${IUSE} innodb"
124
125 mysql_version_is_at_least "5.1" \
126 || IUSE="${IUSE} berkdb" 236|| IUSE="${IUSE} berkdb"
127 237
238[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
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" ]] \
128 mysql_version_is_at_least "5.1.12" \ 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 \
129 && IUSE="${IUSE} pbxt" 279&& IUSE="${IUSE} pbxt" \
280&& mysql_version_is_at_least "5.1.40" \
281&& PBXT_NEWSTYLE=1
130 282
131 RDEPEND="${DEPEND} 283xtradb_patch_available \
132 sys-apps/mysql 284&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
133 selinux? ( sec-policy/selinux-mysql ) 285&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
134 " 286&& XTRADB_SRC_B1="http://www.percona.com/" \
135 287&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
136fi # if [[ "${_MYPVR}" != "${PVR}" ]] 288&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
137 289&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
138EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 290&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
139 pkg_postinst pkg_config pkg_postrm 291&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
292&& IUSE="${IUSE} xtradb"
140 293
141# 294#
142# HELPER FUNCTIONS: 295# HELPER FUNCTIONS:
143# 296#
144 297
145bitkeeper_fetch() { 298# @FUNCTION: mysql_disable_test
146 299# @DESCRIPTION:
147 local reposuf 300# Helper function to disable specific tests.
148 if [[ -z "${1}" ]] ; then
149 local tpv
150 tpv=( ${PV//[-._]/ } )
151 reposuf="mysql-${tpv[0]}.${tpv[1]}"
152 else
153 reposuf="${1}"
154 fi
155 einfo "using \"${reposuf}\" repository."
156 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
157 ## -- ebk_store_dir: bitkeeper sources store directory
158 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
159 ## -- ebk_fetch_cmd: bitkeeper fetch command
160 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
161 # hint: does not work
162 local ebk_fetch_cmd="sfioball"
163 ## -- ebk_update_cmd: bitkeeper update command
164 local ebk_update_cmd="update"
165
166 #addread "/etc/bitkeeper"
167 addwrite "${ebk_store_dir}"
168
169 if [[ ! -d "${ebk_store_dir}" ]]; then
170 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
171 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
172 fi
173
174 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
175
176 local wc_path=${reposuf}
177
178 if [[ ! -d "${wc_path}" ]]; then
179 local options="-r+"
180 # first check out
181 einfo "bitkeeper check out start -->"
182 einfo " repository: ${repo_uri}"
183 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
184 || die "${EBK}: can't fetch from ${repo_uri}."
185 else
186 if [[ ! -d "${wc_path}/BK" ]]; then
187 popd
188 die "Look like ${wc_path} is not a bitkeeper path."
189 fi
190
191 # update working copy
192 einfo "bitkeeper update start -->"
193 einfo " repository: ${repo_uri}"
194
195 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
196 || die "BK: can't update from ${repo_uri} to ${wc_path}."
197 fi
198
199 einfo " working copy: ${wc_path}"
200 cd "${wc_path}"
201 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
202
203 echo
204 popd
205
206}
207
208mysql_disable_test() { 301mysql_disable_test() {
302 local rawtestname testname testsuite reason mysql_disable_file
209 local testname="${1}" ; shift 303 rawtestname="${1}" ; shift
210 local reason="${@}" 304 reason="${@}"
305 ewarn "test '${rawtestname}' disabled: '${reason}'"
306
307 testsuite="${rawtestname/.*}"
308 testname="${rawtestname/*.}"
211 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}"
212 echo ${testname} : ${reason} >> "${mysql_disable_file}" 311 echo ${testname} : ${reason} >> "${mysql_disable_file}"
213 ewarn "test \"${testname}\" disabled because: \"${reason}\""
214}
215 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:
216# void mysql_init_vars() 342# void mysql_init_vars()
217#
218# Initialize global variables 343# Initialize global variables
219# 2005-11-19 <vivo@gentoo.org> 344# 2005-11-19 <vivo@gentoo.org>
220
221mysql_init_vars() { 345mysql_init_vars() {
222 if [[ ${SLOT} == "0" ]] ; then
223 MY_SUFFIX=""
224 else
225 MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
226 fi
227 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"} 346 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
228 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"} 347 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
229 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"} 348 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
230 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"} 349 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
231 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"} 350 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
232 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"} 351 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
233 352
234 if [[ -z "${DATADIR}" ]] ; then 353 if [[ -z "${MY_DATADIR}" ]] ; then
235 DATADIR="" 354 MY_DATADIR=""
236 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 355 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
237 DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null \ 356 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
238 | sed -ne '/datadir/s|^--datadir=||p' \ 357 | sed -ne '/datadir/s|^--datadir=||p' \
239 | tail -n1` 358 | tail -n1`
240 if [[ -z "${DATADIR}" ]] ; then 359 if [[ -z "${MY_DATADIR}" ]] ; then
241 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 360 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
242 | sed -e 's/.*=\s*//'` 361 | sed -e 's/.*=\s*//' \
362 | tail -n1`
243 fi 363 fi
244 fi 364 fi
245 if [[ -z "${DATADIR}" ]] ; then 365 if [[ -z "${MY_DATADIR}" ]] ; then
246 DATADIR="${MY_LOCALSTATEDIR}" 366 MY_DATADIR="${MY_LOCALSTATEDIR}"
247 einfo "Using default DATADIR" 367 einfo "Using default MY_DATADIR"
248 fi 368 fi
249 elog "MySQL DATADIR is ${DATADIR}" 369 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
250 370
251 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 371 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
252 if [[ -e "${DATADIR}" ]] ; then 372 if [[ -e "${MY_DATADIR}" ]] ; then
253 elog "Previous datadir found, it's YOUR job to change" 373 # If you get this and you're wondering about it, see bug #207636
254 elog "ownership and take care of it" 374 elog "MySQL datadir found in ${MY_DATADIR}"
375 elog "A new one will not be created."
255 PREVIOUS_DATADIR="yes" 376 PREVIOUS_DATADIR="yes"
256 else 377 else
257 PREVIOUS_DATADIR="no" 378 PREVIOUS_DATADIR="no"
258 fi 379 fi
259 export PREVIOUS_DATADIR 380 export PREVIOUS_DATADIR
260 fi 381 fi
382 else
383 if [[ ${EBUILD_PHASE} == "config" ]]; then
384 local new_MY_DATADIR
385 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
386 | sed -ne '/datadir/s|^--datadir=||p' \
387 | tail -n1`
388
389 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
390 ewarn "MySQL MY_DATADIR has changed"
391 ewarn "from ${MY_DATADIR}"
392 ewarn "to ${new_MY_DATADIR}"
393 MY_DATADIR="${new_MY_DATADIR}"
394 fi
261 fi 395 fi
396 fi
262 397
398 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
263 MY_SOURCEDIR=${SERVER_URI##*/} 399 MY_SOURCEDIR=${SERVER_URI##*/}
264 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 400 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
401 fi
265 402
266 export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR 403 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
267 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 404 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
268 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 405 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
269} 406}
270 407
271configure_minimal() { 408configure_minimal() {
272 # These are things we exclude from a minimal build, please 409 # These are things we exclude from a minimal build, please
273 # note that the server actually does get built and installed, 410 # note that the server actually does get built and installed,
274 # but we then delete it before packaging. 411 # but we then delete it before packaging.
275 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 412 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
276 413
277 for i in ${minimal_exclude_list} ; do 414 for i in ${minimal_exclude_list} ; do
278 myconf="${myconf} --without-${i}" 415 myconf="${myconf} --without-${i}"
279 done 416 done
280 myconf="${myconf} --with-extra-charsets=none" 417 myconf="${myconf} --with-extra-charsets=none"
281 myconf="${myconf} --enable-local-infile" 418 myconf="${myconf} --enable-local-infile"
282 419
283 if useq "static" ; then 420 if use static ; then
284 myconf="${myconf} --with-client-ldflags=-all-static" 421 myconf="${myconf} --with-client-ldflags=-all-static"
285 myconf="${myconf} --disable-shared" 422 myconf="${myconf} --disable-shared --with-pic"
286 else 423 else
287 myconf="${myconf} --enable-shared --enable-static" 424 myconf="${myconf} --enable-shared --enable-static"
288 fi 425 fi
289 426
290 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 427 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
291 myconf="${myconf} --with-charset=utf8" 428 myconf="${myconf} --with-charset=utf8"
292 myconf="${myconf} --with-collation=utf8_general_ci" 429 myconf="${myconf} --with-collation=utf8_general_ci"
293 else 430 else
294 myconf="${myconf} --with-charset=latin1" 431 myconf="${myconf} --with-charset=latin1"
295 myconf="${myconf} --with-collation=latin1_swedish_ci" 432 myconf="${myconf} --with-collation=latin1_swedish_ci"
303 myconf="${myconf} --with-mysqld-user=mysql" 440 myconf="${myconf} --with-mysqld-user=mysql"
304 myconf="${myconf} --with-server" 441 myconf="${myconf} --with-server"
305 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 442 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
306 myconf="${myconf} --without-libwrap" 443 myconf="${myconf} --without-libwrap"
307 444
308 if useq "static" ; then 445 if use static ; then
309 myconf="${myconf} --with-mysqld-ldflags=-all-static" 446 myconf="${myconf} --with-mysqld-ldflags=-all-static"
310 myconf="${myconf} --with-client-ldflags=-all-static" 447 myconf="${myconf} --with-client-ldflags=-all-static"
311 myconf="${myconf} --disable-shared" 448 myconf="${myconf} --disable-shared --with-pic"
312 else 449 else
313 myconf="${myconf} --enable-shared --enable-static" 450 myconf="${myconf} --enable-shared --enable-static"
314 fi 451 fi
315 452
316 if useq "debug" ; then 453 if use debug ; then
317 myconf="${myconf} --with-debug=full" 454 myconf="${myconf} --with-debug=full"
318 else 455 else
319 myconf="${myconf} --without-debug" 456 myconf="${myconf} --without-debug"
320 mysql_version_is_at_least "4.1.3" \ 457 mysql_version_is_at_least "4.1.3" \
321 && useq "cluster" \ 458 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
322 && myconf="${myconf} --without-ndb-debug" 459 && myconf="${myconf} --without-ndb-debug"
323 fi 460 fi
324 461
462 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
463 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
464 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
465 ewarn "You MUST file bugs without these variables set."
466 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
467 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
325 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then 468 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
326 myconf="${myconf} --with-charset=utf8" 469 myconf="${myconf} --with-charset=utf8"
327 myconf="${myconf} --with-collation=utf8_general_ci" 470 myconf="${myconf} --with-collation=utf8_general_ci"
328 else 471 else
329 myconf="${myconf} --with-charset=latin1" 472 myconf="${myconf} --with-charset=latin1"
330 myconf="${myconf} --with-collation=latin1_swedish_ci" 473 myconf="${myconf} --with-collation=latin1_swedish_ci"
331 fi 474 fi
332 475
333 if useq "embedded" ; then 476 if use embedded ; then
334 myconf="${myconf} --with-embedded-privilege-control" 477 myconf="${myconf} --with-embedded-privilege-control"
335 myconf="${myconf} --with-embedded-server" 478 myconf="${myconf} --with-embedded-server"
336 else 479 else
337 myconf="${myconf} --without-embedded-privilege-control" 480 myconf="${myconf} --without-embedded-privilege-control"
338 myconf="${myconf} --without-embedded-server" 481 myconf="${myconf} --without-embedded-server"
344 myconf="${myconf} $(use_with perl bench)" 487 myconf="${myconf} $(use_with perl bench)"
345 myconf="${myconf} --enable-assembler" 488 myconf="${myconf} --enable-assembler"
346 myconf="${myconf} --with-extra-tools" 489 myconf="${myconf} --with-extra-tools"
347 myconf="${myconf} --with-innodb" 490 myconf="${myconf} --with-innodb"
348 myconf="${myconf} --without-readline" 491 myconf="${myconf} --without-readline"
492 myconf="${myconf} $(use_with ssl openssl)"
349 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)"
350 494
351 if useq "ssl" ; then
352 # --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
353 # has been removed from configure 496 # has been removed from configure
497 # Apply to 4.x and 5.0.[0-3]
498 if use ssl ; then
354 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"
500 fi
501
355 if mysql_version_is_at_least "5.0.6" ; then 502 if mysql_version_is_at_least "5.0.60" ; then
356 # myconf="${myconf} --with-yassl" 503 if use berkdb ; then
504 elog "Berkeley DB support was disabled due to build failures"
505 elog "on multiple arches, go to a version earlier than 5.0.60"
506 elog "if you want it again. Gentoo bug #224067."
507 fi
357 myconf="${myconf} --with-ssl" 508 myconf="${myconf} --without-berkeley-db"
509 elif use berkdb ; then
510 # The following fix is due to a bug with bdb on SPARC's. See:
511 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
512 # It comes down to non-64-bit safety problems.
513 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
514 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
515 myconf="${myconf} --without-berkeley-db"
358 else 516 else
359 myconf="${myconf} --with-openssl" 517 myconf="${myconf} --with-berkeley-db=./bdb"
360 fi 518 fi
361 else 519 else
362 myconf="${myconf} --without-openssl"
363 fi
364
365 # The following fix is due to a bug with bdb on SPARC's. See:
366 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
367 # It comes down to non-64-bit safety problems.
368 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
369 elog "Berkeley DB support was disabled due to incompatible arch"
370 myconf="${myconf} --without-berkeley-db" 520 myconf="${myconf} --without-berkeley-db"
371 else
372 if useq "berkdb" ; then
373 myconf="${myconf} --with-berkeley-db=./bdb"
374 else
375 myconf="${myconf} --without-berkeley-db"
376 fi
377 fi 521 fi
378 522
379 if mysql_version_is_at_least "4.1.3" ; then 523 if mysql_version_is_at_least "4.1.3" ; then
380 myconf="${myconf} --with-geometry" 524 myconf="${myconf} --with-geometry"
525 if [[ "${PN}" != "mysql-cluster" ]] ; then
381 myconf="${myconf} $(use_with cluster ndbcluster)" 526 myconf="${myconf} $(use_with cluster ndbcluster)"
382 fi 527 fi
528 fi
383 529
384 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then 530 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
385 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 531 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
386 myconf="${myconf} --with-archive-storage-engine" 532 myconf="${myconf} --with-archive-storage-engine"
387 533
388 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 534 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
389 myconf="${myconf} --with-csv-storage-engine" 535 myconf="${myconf} --with-csv-storage-engine"
399 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 545 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
400 myconf="${myconf} --with-federated-storage-engine" 546 myconf="${myconf} --with-federated-storage-engine"
401 fi 547 fi
402 fi 548 fi
403 549
550 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
551 myconf="${myconf} `use_enable community community-features`"
552 if use community; then
553 myconf="${myconf} `use_enable profiling`"
554 else
555 myconf="${myconf} --disable-profiling"
556 fi
557 fi
558
404 mysql_version_is_at_least "5.0.18" \ 559 mysql_version_is_at_least "5.0.18" \
405 && useq "max-idx-128" \ 560 && use max-idx-128 \
406 && myconf="${myconf} --with-max-indexes=128" 561 && myconf="${myconf} --with-max-indexes=128"
407} 562}
408 563
409configure_51() { 564configure_51() {
410 # TODO: !!!! readd --without-readline 565 # TODO: !!!! readd --without-readline
411 # the failure depend upon config/ac-macros/readline.m4 checking into 566 # the failure depend upon config/ac-macros/readline.m4 checking into
412 # readline.h instead of history.h 567 # readline.h instead of history.h
413 myconf="${myconf} $(use_with ssl)" 568 myconf="${myconf} $(use_with ssl ssl /usr)"
414 myconf="${myconf} --enable-assembler" 569 myconf="${myconf} --enable-assembler"
415 myconf="${myconf} --with-geometry" 570 myconf="${myconf} --with-geometry"
416 myconf="${myconf} --with-readline" 571 myconf="${myconf} --with-readline"
417 myconf="${myconf} --with-row-based-replication"
418 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 572 myconf="${myconf} --with-zlib-dir=/usr/"
419 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"
420 useq "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 )"
421 606
422 # 5.1 introduces a new way to manage storage engines (plugins) 607 # 5.1 introduces a new way to manage storage engines (plugins)
423 # like configuration=none 608 # like configuration=none
609 # This base set are required, and will always be statically built.
424 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
425 if useq "extraengine" ; then 622 if use extraengine ; then
426 # 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
427 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"
428 628
629 if [[ "${PN}" != "mariadb" ]] ; then
429 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"
430 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"
431 fi 635 fi
432 636 else
433 if useq "innodb" ; then 637 plugins_dis="${plugins_dis} partition federated"
434 plugins="${plugins},innobase"
435 fi 638 fi
639
640 # Upstream specifically requests that InnoDB always be built:
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
436 649
437 # like configuration=max-no-ndb 650 # like configuration=max-no-ndb
438 if useq "cluster" ; then 651 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
439 plugins="${plugins},ndbcluster" 652 plugins_sta="${plugins_sta} ndbcluster partition"
653 plugins_dis="${plugins_dis//partition}"
440 myconf="${myconf} --with-ndb-binlog" 654 myconf="${myconf} --with-ndb-binlog"
655 else
656 plugins_dis="${plugins_dis} ndbcluster"
441 fi 657 fi
442 658
443 if mysql_version_is_at_least "5.2" ; then 659 if [[ "${PN}" == "mariadb" ]] ; then
444 plugins="${plugins},falcon" 660 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
445 fi 661 # caught above.
662 plugins_sta="${plugins_sta} maria"
446 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
447 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
698}
699
700pbxt_src_configure() {
701 mysql_init_vars
702
703 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
704
705 einfo "Reconfiguring dir '${PWD}'"
706 eautoreconf
707
708 local myconf=""
709 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
710 use debug && myconf="${myconf} --with-debug=full"
711 econf ${myconf} || die "Problem configuring PBXT storage engine"
448} 712}
449 713
450pbxt_src_compile() { 714pbxt_src_compile() {
451 mysql_init_vars
452 715
453 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 716 # Be backwards compatible for now
454 717 if [[ $EAPI != 2 ]]; then
455 einfo "Reconfiguring dir '${PWD}'" 718 pbxt_src_configure
456 AT_GNUCONF_UPDATE="yes" eautoreconf 719 fi
457
458 local myconf
459 myconf="${myconf} --with-mysql=${S}"
460 mkdir -p ${T}/lib
461 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}"
462 useq "debug" && myconf="${myconf} --with-debug=full"
463 # TODO is safe/needed to use econf here ?
464 ./configure ${myconf} || die "problem configuring pbxt storage engine"
465 # TODO is safe/needed to use emake here ? 720 # TODO: is it safe/needed to use emake here ?
466 make || die "problem making pbxt storage engine (${myconf})" 721 make || die "Problem making PBXT storage engine (${myconf})"
467 722
468 popd 723 popd
469 # TODO: modify test suite 724 # TODO: modify test suite for PBXT
470} 725}
471 726
472pbxt_src_install() { 727pbxt_src_install() {
473 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 728 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
474 make install || die "failed pbxt install" 729 emake install DESTDIR="${D}" || die "Failed to install PBXT"
475 popd 730 popd
476} 731}
477 732
478# 733#
479# EBUILD FUNCTIONS 734# EBUILD FUNCTIONS
480# 735#
481 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
482mysql_pkg_setup() { 743mysql_pkg_setup() {
483 enewgroup mysql 60 || die "problem adding 'mysql' group" 744 if hasq test ${FEATURES} ; then
484 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 745 if ! use minimal ; then
746 if [[ $UID -eq 0 ]]; then
747 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
748 fi
749 fi
750 fi
485 751
486 # Check for USE flag problems in pkg_setup 752 # Check for USE flag problems in pkg_setup
487 if useq "static" && useq "ssl" ; then 753 if use static && use ssl ; then
488 eerror "MySQL does not support being built statically with SSL support enabled!"
489 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}"
757 fi
758
759 if mysql_version_is_at_least "5.1.51" \
760 && ! mysql_version_is_at_least "5.2" \
761 && use debug ; then
762 # Also in package.use.mask
763 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
490 fi 764 fi
491 765
492 if ! mysql_version_is_at_least "5.0" \ 766 if ! mysql_version_is_at_least "5.0" \
493 && useq "raid" \ 767 && use raid \
494 && useq "static" ; then 768 && use static ; then
495 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 769 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
496 eerror "with RAID support enabled." 770 eerror "with RAID support enabled."
497 die "USE flags 'raid' and 'static' conflict!" 771 die "USE flags 'raid' and 'static' conflict!"
498 fi 772 fi
499 773
500 if mysql_version_is_at_least "4.1.3" \ 774 if mysql_version_is_at_least "4.1.3" \
501 && ( useq "cluster" || useq "extraengine" ) \ 775 && ( use cluster || use extraengine || use embedded ) \
502 && useq "minimal" ; then 776 && use minimal ; then
503 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
504 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 777 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
778 eerror "${M}"
779 die "${M}"
505 fi 780 fi
781
782 if mysql_version_is_at_least "5.1" \
783 && xtradb_patch_available \
784 && use xtradb \
785 && use embedded ; then
786 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
787 eerror "${M}"
788 die "${M}"
789 fi
790
791 # Bug #290570, 284946, 307251
792 # Upstream changes made us need a fairly new GCC4.
793 # But only for 5.0.8[3-6]!
794 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
795 GCC_VER=$(gcc-version)
796 case ${GCC_VER} in
797 2*|3*|4.0|4.1|4.2)
798 eerror "Some releases of MySQL required a very new GCC, and then"
799 eerror "later release relaxed that requirement again. Either pick a"
800 eerror "MySQL >=5.0.87, or use a newer GCC."
801 die "Active GCC too old!" ;;
802 esac
803 fi
804
805 # This should come after all of the die statements
806 enewgroup mysql 60 || die "problem adding 'mysql' group"
807 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
506 808
507 mysql_check_version_range "4.0 to 5.0.99.99" \ 809 mysql_check_version_range "4.0 to 5.0.99.99" \
508 && useq "berkdb" \ 810 && use berkdb \
509 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 811 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
510}
511 812
813 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
814 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
815 ewarn "5.1 series should NOT be put into production. In the near"
816 ewarn "future, it will be disabled from building."
817 ewarn ""
818 ewarn "If you need NDB support, you should instead move to the new"
819 ewarn "mysql-cluster package that represents that upstream NDB"
820 ewarn "development."
821 fi
822}
823
824# @FUNCTION: mysql_src_unpack
825# @DESCRIPTION:
826# Unpack the source code and call mysql_src_prepare for EAPI < 2.
512mysql_src_unpack() { 827mysql_src_unpack() {
513 # Initialize the proper variables first 828 # Initialize the proper variables first
514 mysql_init_vars 829 mysql_init_vars
515 830
516 unpack ${A} 831 unpack ${A}
517 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 832 # Grab the patches
518 if mysql_check_version_range "5.1 to 5.1.99" ; then 833 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
519 bitkeeper_fetch "mysql-5.1-ndb" 834
520 elif mysql_check_version_range "5.2.0 to 5.2.99" ; then
521 bitkeeper_fetch "mysql-5.2-falcon"
522 else
523 bitkeeper_fetch
524 fi
525 cd "${S}"
526 einfo "running upstream autorun on bk sources"
527 BUILD/autorun.sh
528 else
529 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 835 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
836
837 # Be backwards compatible for now
838 case ${EAPI:-0} in
839 2) : ;;
840 0 | 1) mysql_src_prepare ;;
841 esac
842}
843
844# @FUNCTION: mysql_src_prepare
845# @DESCRIPTION:
846# Apply patches to the source code and remove unneeded bundled libs.
847mysql_src_prepare() {
530 cd "${S}" 848 cd "${S}"
531 fi
532 849
533 # Apply the patches for this MySQL version 850 # Apply the patches for this MySQL version
534 EPATCH_SUFFIX="patch" 851 EPATCH_SUFFIX="patch"
535 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 852 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
853 # Clean out old items
854 rm -f "${EPATCH_SOURCE}"/*
855 # Now link in right patches
536 mysql_mv_patches 856 mysql_mv_patches
537 epatch || die "failed to apply all patches" 857 # And apply
858 epatch
538 859
539 # Additional checks, remove bundled zlib 860 # last -fPIC fixup, per bug #305873
861 i="${S}"/storage/innodb_plugin/plug.in
862 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
863
864 # Additional checks, remove bundled zlib (Cluster needs this, for static
865 # memory management in zlib, leave available for Cluster)
866 if [[ "${PN}" != "mysql-cluster" ]] ; then
540 rm -f "${S}/zlib/"*.[ch] 867 rm -f "${S}/zlib/"*.[ch]
541 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 868 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
869 fi
542 rm -f "scripts/mysqlbug" 870 rm -f "scripts/mysqlbug"
543 871
544 # Make charsets install in the right place 872 # Make charsets install in the right place
545 find . -name 'Makefile.am' \ 873 find . -name 'Makefile.am' \
546 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 874 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
547 875
548 if mysql_version_is_at_least "4.1" ; then 876 if mysql_version_is_at_least "4.1" ; then
549 # Remove what needs to be recreated, so we're sure it's actually done 877 # Remove what needs to be recreated, so we're sure it's actually done
878 einfo "Cleaning up old buildscript files"
550 find . -name Makefile \ 879 find . -name Makefile \
551 -o -name Makefile.in \ 880 -o -name Makefile.in \
552 -o -name configure \ 881 -o -name configure \
553 -exec rm -f {} \; 882 -exec rm -f {} \;
554 rm -f "ltmain.sh" 883 rm -f "ltmain.sh"
555 rm -f "scripts/mysqlbug" 884 rm -f "scripts/mysqlbug"
556 fi 885 fi
557 886
558 local rebuilddirlist d 887 local rebuilddirlist d
559 888
889 if xtradb_patch_available && use xtradb ; then
890 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
891 pushd "${S}"/storage >/dev/null
892 i="innobase"
893 o="${WORKDIR}/storage-${i}.mysql-upstream"
894 # Have we been here already?
895 [ -d "${o}" ] && rm -f "${i}"
896 # Or maybe we haven't
897 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
898 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
899 popd >/dev/null
900 fi
901
902 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
903 einfo "Adding storage engine: PBXT"
904 pushd "${S}"/storage >/dev/null
905 i='pbxt'
906 [ -d "${i}" ] && rm -rf "${i}"
907 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
908 popd >/dev/null
909 fi
910
560 if mysql_version_is_at_least "5.1.12" ; then 911 if mysql_version_is_at_least "5.1.12" ; then
561 rebuilddirlist="." 912 rebuilddirlist="."
913 # This does not seem to be needed presently. robbat2 2010/02/23
914 #einfo "Updating innobase cmake"
562 # TODO IMPO! Check this with a cmake expert 915 ## TODO: check this with a cmake expert
563 useq "innodb" \
564 && cmake \ 916 #cmake \
565 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 917 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
566 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 918 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
567 "storage/innobase" 919 # "storage/innobase"
568 else 920 else
569 rebuilddirlist=". innobase" 921 rebuilddirlist=". innobase"
570 fi 922 fi
571 923
572 for d in ${rebuilddirlist} ; do 924 for d in ${rebuilddirlist} ; do
573 einfo "Reconfiguring dir '${d}'" 925 einfo "Reconfiguring dir '${d}'"
574 pushd "${d}" &>/dev/null 926 pushd "${d}" &>/dev/null
575 AT_GNUCONF_UPDATE="yes" eautoreconf 927 eautoreconf
576 popd &>/dev/null 928 popd &>/dev/null
577 done 929 done
578 930
579 if mysql_check_version_range "4.1 to 5.0.99.99" \ 931 if mysql_check_version_range "4.1 to 5.0.99.99" \
580 && useq "berkdb" ; then 932 && use berkdb ; then
933 einfo "Fixing up berkdb buildsystem"
581 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 934 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
935 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
936 || die "Could not copy libtool.m4 to bdb/dist/"
937 #These files exist only with libtool-2*, and need to be included.
938 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
939 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
940 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
941 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
942 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
943 fi
582 pushd "bdb/dist" \ 944 pushd "bdb/dist" &>/dev/null
583 && sh s_all \ 945 sh s_all \
584 || die "Failed bdb reconfigure" \ 946 || die "Failed bdb reconfigure"
585 &>/dev/null
586 popd &>/dev/null 947 popd &>/dev/null
587 fi 948 fi
588} 949}
589 950
951# @FUNCTION: mysql_src_configure
952# @DESCRIPTION:
953# Configure mysql to build the code for Gentoo respecting the use flags.
590mysql_src_compile() { 954mysql_src_configure() {
591 # Make sure the vars are correctly initialized 955 # Make sure the vars are correctly initialized
592 mysql_init_vars 956 mysql_init_vars
593 957
594 # $myconf is modified by the configure_* functions 958 # $myconf is modified by the configure_* functions
595 local myconf="" 959 local myconf=""
596 960
597 if useq "minimal" ; then 961 if use minimal ; then
598 configure_minimal 962 configure_minimal
599 else 963 else
600 configure_common 964 configure_common
601 if mysql_version_is_at_least "5.1.10" ; then 965 if mysql_version_is_at_least "5.1.10" ; then
602 configure_51 966 configure_51
609 filter-flags "-O" "-O[01]" 973 filter-flags "-O" "-O[01]"
610 974
611 # glib-2.3.2_pre fix, bug #16496 975 # glib-2.3.2_pre fix, bug #16496
612 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 976 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
613 977
978 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
979 # fail badly during cluster startup.
980 if [[ $(gcc-major-version) -lt 4 ]]; then
981 filter-flags "-fstack-protector-all"
982 fi
983
614 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 984 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
615 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 985 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
616 mysql_version_is_at_least "5.0" \ 986 mysql_version_is_at_least "5.0" \
617 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 987 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
618 export CXXFLAGS 988 export CXXFLAGS
619 989
990 # bug #283926, with GCC4.4, this is required to get correct behavior.
991 append-flags -fno-strict-aliasing
992
993 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
994 # causes a mis-compile.
995 # Upstream bugs:
996 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
997 # http://bugs.mysql.com/bug.php?id=45205
998 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
999 append-flags -fno-omit-frame-pointer && \
1000 filter-flags -fomit-frame-pointer
1001
620 econf \ 1002 econf \
621 --program-suffix="${MY_SUFFIX}" \
622 --libexecdir="/usr/sbin" \ 1003 --libexecdir="/usr/sbin" \
623 --sysconfdir="${MY_SYSCONFDIR}" \ 1004 --sysconfdir="${MY_SYSCONFDIR}" \
624 --localstatedir="${MY_LOCALSTATEDIR}" \ 1005 --localstatedir="${MY_LOCALSTATEDIR}" \
625 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1006 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
626 --libdir="${MY_LIBDIR}" \ 1007 --libdir="${MY_LIBDIR}" \
635 # TODO: Move this before autoreconf !!! 1016 # TODO: Move this before autoreconf !!!
636 find . -type f -name Makefile -print0 \ 1017 find . -type f -name Makefile -print0 \
637 | xargs -0 -n100 sed -i \ 1018 | xargs -0 -n100 sed -i \
638 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1019 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
639 1020
1021 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1022 pbxt_patch_available && use pbxt && pbxt_src_configure
1023 fi
1024}
1025
1026# @FUNCTION: mysql_src_compile
1027# @DESCRIPTION:
1028# Compile the mysql code.
1029mysql_src_compile() {
1030 # Be backwards compatible for now
1031 case ${EAPI:-0} in
1032 2) : ;;
1033 0 | 1) mysql_src_configure ;;
1034 esac
1035
640 emake || die "emake failed" 1036 emake || die "emake failed"
641 1037
642 mysql_version_is_at_least "5.1.1" && useq "pbxt" && pbxt_src_compile 1038 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1039 pbxt_patch_available && use pbxt && pbxt_src_compile
1040 fi
643} 1041}
644 1042
1043# @FUNCTION: mysql_src_install
1044# @DESCRIPTION:
1045# Install mysql.
645mysql_src_install() { 1046mysql_src_install() {
646 # Make sure the vars are correctly initialized 1047 # Make sure the vars are correctly initialized
647 mysql_init_vars 1048 mysql_init_vars
648 1049
649 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 1050 emake install \
1051 DESTDIR="${D}" \
1052 benchdir_root="${MY_SHAREDSTATEDIR}" \
1053 testroot="${MY_SHAREDSTATEDIR}" \
1054 || die "emake install failed"
650 1055
651 mysql_version_is_at_least "5.1.12" && useq "pbxt" && pbxt_src_install 1056 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
652 1057 pbxt_patch_available && use pbxt && pbxt_src_install
653 insinto "${MY_INCLUDEDIR}" 1058 fi
654 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
655 1059
656 # Convenience links 1060 # Convenience links
1061 einfo "Making Convenience links for mysqlcheck multi-call binary"
657 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 1062 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
658 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 1063 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
659 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 1064 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
660 1065
661 # Various junk (my-*.cnf moved elsewhere) 1066 # Various junk (my-*.cnf moved elsewhere)
1067 einfo "Removing duplicate /usr/share/mysql files"
662 rm -Rf "${D}/usr/share/info" 1068 rm -Rf "${D}/usr/share/info"
663 for removeme in "mysql-log-rotate" mysql.server* \ 1069 for removeme in "mysql-log-rotate" mysql.server* \
664 binary-configure* my-*.cnf mi_test_all* 1070 binary-configure* my-*.cnf mi_test_all*
665 do 1071 do
666 rm -f "${D}"/usr/share/mysql/${removeme} 1072 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
667 done 1073 done
668 1074
669 # TODO change at Makefile-am level
670 if [[ ${PN} == "mysql-slotted" ]] ; then
671 for moveme in "mysql_fix_privilege_tables.sql" \
672 "fill_help_tables.sql" "ndb-config-2-node.ini"
673 do
674 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
675 done
676 fi
677
678 # clean up stuff for a minimal build 1075 # Clean up stuff for a minimal build
679 if useq "minimal" ; then 1076 if use minimal ; then
1077 einfo "Remove all extra content for minimal build"
680 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1078 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
681 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} 1079 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}
682 rm -f "${D}/usr/sbin/mysqld" 1080 rm -f "${D}/usr/sbin/mysqld"
683 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1081 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
684 fi 1082 fi
685 1083
686 if [[ ${PN} == "mysql-slotted" ]] ; then 1084 # Unless they explicitly specific USE=test, then do not install the
687 local notcatched=$(ls "${D}/usr/share/mysql"/*) 1085 # testsuite. It DOES have a use to be installed, esp. when you want to do a
688 if [[ -n "${notcatched}" ]] ; then 1086 # validation of your database configuration after tuning it.
689 ewarn "QA notice" 1087 if use !test ; then
690 ewarn "${notcatched} files in /usr/share/mysql" 1088 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
691 ewarn "bug mysql-herd to manage them"
692 fi
693 rm -Rf "${D}/usr/share/mysql"
694 fi 1089 fi
695 1090
696 # Configuration stuff 1091 # Configuration stuff
697 if mysql_version_is_at_least "4.1" ; then 1092 case ${MYSQL_PV_MAJOR} in
698 mysql_mycnf_version="4.1"
699 else
700 mysql_mycnf_version="4.0" 1093 3*|4.0) mysql_mycnf_version="4.0" ;;
701 fi 1094 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
1095 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1096 esac
1097 einfo "Building default my.cnf (${mysql_mycnf_version})"
702 insinto "${MY_SYSCONFDIR}" 1098 insinto "${MY_SYSCONFDIR}"
703 doins scripts/mysqlaccess.conf 1099 doins scripts/mysqlaccess.conf
704 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \ 1100 mycnf_src="my.cnf-${mysql_mycnf_version}"
705 -e "s!@DATADIR@!${DATADIR}!g" \ 1101 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
706 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1102 "${FILESDIR}/${mycnf_src}" \
707 > "${TMPDIR}/my.cnf.ok" 1103 > "${TMPDIR}/my.cnf.ok"
708 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 1104 if use latin1 ; then
709 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 1105 sed -i \
1106 -e "/character-set/s|utf8|latin1|g" \
1107 "${TMPDIR}/my.cnf.ok"
710 fi 1108 fi
711 newins "${TMPDIR}/my.cnf.ok" my.cnf 1109 newins "${TMPDIR}/my.cnf.ok" my.cnf
712 1110
713 # Minimal builds don't have the MySQL server 1111 # Minimal builds don't have the MySQL server
714 if ! useq "minimal" ; then 1112 if ! use minimal ; then
1113 einfo "Creating initial directories"
715 # Empty directories ... 1114 # Empty directories ...
716 diropts "-m0750" 1115 diropts "-m0750"
717 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1116 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
718 dodir "${DATADIR}" 1117 dodir "${MY_DATADIR}"
719 keepdir "${DATADIR}" 1118 keepdir "${MY_DATADIR}"
720 chown -R mysql:mysql "${D}/${DATADIR}" 1119 chown -R mysql:mysql "${D}/${MY_DATADIR}"
721 fi 1120 fi
722 1121
723 diropts "-m0755" 1122 diropts "-m0755"
724 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1123 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
725 dodir "${folder}" 1124 dodir "${folder}"
727 chown -R mysql:mysql "${D}/${folder}" 1126 chown -R mysql:mysql "${D}/${folder}"
728 done 1127 done
729 fi 1128 fi
730 1129
731 # Docs 1130 # Docs
1131 einfo "Installing docs"
732 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1132 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
1133 doinfo "${S}"/Docs/mysql.info
733 1134
734 # Minimal builds don't have the MySQL server 1135 # Minimal builds don't have the MySQL server
735 if ! useq "minimal" ; then 1136 if ! use minimal ; then
1137 einfo "Including support files and sample configurations"
1138 docinto "support-files"
1139 for script in \
1140 "${S}"/support-files/my-*.cnf \
1141 "${S}"/support-files/magic \
1142 "${S}"/support-files/ndb-config-2-node.ini
1143 do
1144 [[ -f "$script" ]] && dodoc "${script}"
1145 done
1146
1147 docinto "scripts"
1148 for script in "${S}"/scripts/mysql* ; do
1149 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
1150 done
1151
1152 fi
1153
1154 mysql_lib_symlinks "${D}"
1155}
1156
1157# @FUNCTION: mysql_pkg_preinst
1158# @DESCRIPTION:
1159# Create the user and groups for mysql - die if that fails.
1160mysql_pkg_preinst() {
1161 enewgroup mysql 60 || die "problem adding 'mysql' group"
1162 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
1163}
1164
1165# @FUNCTION: mysql_pkg_postinst
1166# @DESCRIPTION:
1167# Run post-installation tasks:
1168# create the dir for logfiles if non-existant
1169# touch the logfiles and secure them
1170# install scripts
1171# issue required steps for optional features
1172# issue deprecation warnings
1173mysql_pkg_postinst() {
1174 # Make sure the vars are correctly initialized
1175 mysql_init_vars
1176
1177 # Check FEATURES="collision-protect" before removing this
1178 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
1179
1180 # Secure the logfiles
1181 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1182 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1183 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1184
1185 # Minimal builds don't have the MySQL server
1186 if ! use minimal ; then
736 docinto "support-files" 1187 docinto "support-files"
737 for script in \ 1188 for script in \
738 support-files/my-*.cnf \ 1189 support-files/my-*.cnf \
739 support-files/magic \ 1190 support-files/magic \
740 support-files/ndb-config-2-node.ini 1191 support-files/ndb-config-2-node.ini
741 do 1192 do
1193 [[ -f "${script}" ]] \
742 dodoc "${script}" 1194 && dodoc "${script}"
743 done 1195 done
744 1196
745 docinto "scripts" 1197 docinto "scripts"
746 for script in scripts/mysql* ; do 1198 for script in scripts/mysql* ; do
1199 [[ -f "${script}" ]] \
747 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1200 && [[ "${script%.sh}" == "${script}" ]] \
1201 && dodoc "${script}"
748 done 1202 done
749 fi
750 1203
751 if [[ ${PN} == "mysql-slotted" ]] ; then 1204 einfo
752 # MOVED HERE DUE TO BUG #121445 1205 elog "You might want to run:"
753 # create a list of files, to be used 1206 elog "\"emerge --config =${CATEGORY}/${PF}\""
754 # by external utilities 1207 elog "if this is a new install."
755 mkdir -p "${D}/var/lib/eselect/mysql/" 1208 einfo
756 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
757 pushd "${D}/" &>/dev/null
758 find usr/bin/ usr/sbin/ \
759 -type f -name "*${MY_SUFFIX}*" \
760 -and -not -name "mysql_config${MY_SUFFIX}" \
761 > "${filelist}"
762 find usr/share/man \
763 -type f -name "*${MY_SUFFIX}*" \
764 | sed -e 's/$/.gz/' \
765 >> "${filelist}"
766 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
767 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
768 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
769 popd &>/dev/null
770 fi
771 1209
772 mysql_lib_symlinks "${D}" 1210 einfo
773} 1211 elog "If you are upgrading major versions, you should run the"
1212 elog "mysql_upgrade tool."
1213 einfo
1214 fi
774 1215
775mysql_pkg_preinst() { 1216 if pbxt_available && use pbxt ; then
776 enewgroup mysql 60 || die "problem adding 'mysql' group" 1217 # TODO: explain it better
777 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 1218 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
778} 1219 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
1220 elog "if, after that, you cannot start the MySQL server,"
1221 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1222 elog "use the MySQL upgrade script to restore the table"
1223 elog "or execute the following SQL command:"
1224 elog " CREATE TABLE IF NOT EXISTS plugin ("
1225 elog " name char(64) binary DEFAULT '' NOT NULL,"
1226 elog " dl char(128) DEFAULT '' NOT NULL,"
1227 elog " PRIMARY KEY (name)"
1228 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
1229 fi
779 1230
1231 mysql_check_version_range "4.0 to 5.0.99.99" \
1232 && use berkdb \
1233 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
1234}
1235
1236# @FUNCTION: mysql_pkg_config
1237# @DESCRIPTION:
1238# Configure mysql environment.
780mysql_pkg_postinst() { 1239mysql_pkg_config() {
1240 local old_MY_DATADIR="${MY_DATADIR}"
1241
781 # Make sure the vars are correctly initialized 1242 # Make sure the vars are correctly initialized
782 mysql_init_vars 1243 mysql_init_vars
783 1244
784 # Check FEATURES="collision-protect" before removing this
785 [[ -d "${ROOT}/var/log/mysql" ]] \
786 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
787
788 # Secure the logfiles
789 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
790 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
791 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
792
793 # Minimal builds don't have the MySQL server
794 if ! useq "minimal" ; then
795 docinto "support-files"
796 for script in \
797 support-files/my-*.cnf \
798 support-files/magic \
799 support-files/ndb-config-2-node.ini
800 do
801 dodoc "${script}"
802 done
803
804 docinto "scripts"
805 for script in scripts/mysql* ; do
806 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
807 done
808 fi
809
810 einfo "you may want to read slotting upgrade documents in the overlay"
811 if useq "pbxt" && mysql_version_is_at_least "5.1" ; then
812 # TODO tell it better ;-)
813 einfo "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
814 einfo "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
815 einfo "if, after that you cannot start the mysql server"
816 einfo "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
817 einfo "use the mysql upgrade script to restore the table"
818 einfo " or "
819 einfo "CREATE TABLE IF NOT EXISTS plugin ("
820 einfo " name char(64) binary DEFAULT '' NOT NULL,"
821 einfo " dl char(128) DEFAULT '' NOT NULL,"
822 einfo " PRIMARY KEY (name)"
823 einfo ") CHARACTER SET utf8 COLLATE utf8_bin;"
824 fi
825 mysql_check_version_range "4.0 to 5.0.99.99" \
826 && useq "berkdb" \
827 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
828}
829
830mysql_pkg_config() {
831 # Make sure the vars are correctly initialized
832 mysql_init_vars
833
834 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 1245 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
835 1246
836 if built_with_use ${CATEGORY}/${PN} minimal ; then 1247 if built_with_use ${CATEGORY}/${PN} minimal ; then
837 die "Minimal builds do NOT include the MySQL server" 1248 die "Minimal builds do NOT include the MySQL server"
838 fi 1249 fi
839 1250
1251 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1252 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
1253 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
1254
1255 if [[ -d "${old_MY_DATADIR_s}" ]]; then
1256 if [[ -d "${MY_DATADIR_s}" ]]; then
1257 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1258 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
1259 else
1260 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
1261 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
1262 || die "Moving MY_DATADIR failed"
1263 fi
1264 else
1265 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
1266 if [[ -d "${MY_DATADIR_s}" ]]; then
1267 ewarn "Attempting to use ${MY_DATADIR_s}"
1268 else
1269 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
1270 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
1271 fi
1272 fi
1273 fi
1274
840 local pwd1="a" 1275 local pwd1="a"
841 local pwd2="b" 1276 local pwd2="b"
1277 local MYSQL_ROOT_PASSWORD=''
842 local maxtry=5 1278 local maxtry=15
843 1279
1280 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
1281 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
1282 fi
1283
844 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 1284 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
845 ewarn "You have already a MySQL database in place." 1285 ewarn "You have already a MySQL database in place."
846 ewarn "(${ROOT}/${DATADIR}/*)" 1286 ewarn "(${ROOT}/${MY_DATADIR}/*)"
847 ewarn "Please rename or delete it if you wish to replace it." 1287 ewarn "Please rename or delete it if you wish to replace it."
848 die "MySQL database already exists!" 1288 die "MySQL database already exists!"
849 fi 1289 fi
850 1290
851 einfo "Creating the mysql database and setting proper" 1291 # Bug #213475 - MySQL _will_ object strenously if your machine is named
852 einfo "permissions on it ..." 1292 # localhost. Also causes weird failures.
1293 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
853 1294
1295 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1296
854 einfo "Insert a password for the mysql 'root' user" 1297 einfo "Please provide a password for the mysql 'root' user now,"
1298 einfo "or in the MYSQL_ROOT_PASSWORD env var."
855 ewarn "Avoid [\"'\\_%] characters in the password" 1299 ewarn "Avoid [\"'\\_%] characters in the password"
856 read -rsp " >" pwd1 ; echo 1300 read -rsp " >" pwd1 ; echo
857 1301
858 einfo "Retype the password" 1302 einfo "Retype the password"
859 read -rsp " >" pwd2 ; echo 1303 read -rsp " >" pwd2 ; echo
860 1304
861 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1305 if [[ "x$pwd1" != "x$pwd2" ]] ; then
862 die "Passwords are not the same" 1306 die "Passwords are not the same"
1307 fi
1308 MYSQL_ROOT_PASSWORD="${pwd1}"
1309 unset pwd1 pwd2
863 fi 1310 fi
864 1311
865 local options="" 1312 local options=""
866 local sqltmp="$(emktemp)" 1313 local sqltmp="$(emktemp)"
867 1314
870 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1317 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
871 || touch "${TMPDIR}/fill_help_tables.sql" 1318 || touch "${TMPDIR}/fill_help_tables.sql"
872 help_tables="${TMPDIR}/fill_help_tables.sql" 1319 help_tables="${TMPDIR}/fill_help_tables.sql"
873 1320
874 pushd "${TMPDIR}" &>/dev/null 1321 pushd "${TMPDIR}" &>/dev/null
875 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 1322 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
1323 if [ $? -ne 0 ]; then
1324 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1325 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1326 fi
876 popd &>/dev/null 1327 popd &>/dev/null
877 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 1328 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
878 || die "MySQL databases not installed" 1329 || die "MySQL databases not installed"
879 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 1330 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
880 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 1331 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1332
1333 # Figure out which options we need to disable to do the setup
1334 helpfile="${TMPDIR}/mysqld-help"
1335 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1336 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1337 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1338 ndbcluster \
1339 ; do
1340 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1341 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1342 done
1343 # But some options changed names
1344 egrep -sq external-locking "${helpfile}" && \
1345 options="${options/skip-locking/skip-external-locking}"
881 1346
882 if mysql_version_is_at_least "4.1.3" ; then 1347 if mysql_version_is_at_least "4.1.3" ; then
883 options="--skip-ndbcluster"
884
885 # Filling timezones, see 1348 # Filling timezones, see
886 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1349 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
887 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1350 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
888 1351
889 if [[ -r "${help_tables}" ]] ; then 1352 if [[ -r "${help_tables}" ]] ; then
890 cat "${help_tables}" >> "${sqltmp}" 1353 cat "${help_tables}" >> "${sqltmp}"
891 fi 1354 fi
892 fi 1355 fi
1356
1357 einfo "Creating the mysql database and setting proper"
1358 einfo "permissions on it ..."
893 1359
894 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1360 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
895 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1361 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
896 local mysqld="${ROOT}/usr/sbin/mysqld \ 1362 local mysqld="${ROOT}/usr/sbin/mysqld \
897 ${options} \ 1363 ${options} \
898 --user=mysql \ 1364 --user=mysql \
899 --skip-grant-tables \
900 --basedir=${ROOT}/usr \ 1365 --basedir=${ROOT}/usr \
901 --datadir=${ROOT}/${DATADIR} \ 1366 --datadir=${ROOT}/${MY_DATADIR} \
902 --skip-innodb \
903 --skip-bdb \
904 --skip-networking \
905 --max_allowed_packet=8M \ 1367 --max_allowed_packet=8M \
906 --net_buffer_length=16K \ 1368 --net_buffer_length=16K \
1369 --default-storage-engine=MyISAM \
907 --socket=${socket} \ 1370 --socket=${socket} \
908 --pid-file=${pidfile}" 1371 --pid-file=${pidfile}"
1372 #einfo "About to start mysqld: ${mysqld}"
1373 ebegin "Starting mysqld"
909 ${mysqld} & 1374 ${mysqld} &
1375 rc=$?
910 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1376 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
911 maxtry=$((${maxtry}-1)) 1377 maxtry=$((${maxtry}-1))
912 echo -n "." 1378 echo -n "."
913 sleep 1 1379 sleep 1
914 done 1380 done
1381 eend $rc
915 1382
1383 if ! [[ -S "${socket}" ]]; then
1384 die "Completely failed to start up mysqld with: ${mysqld}"
1385 fi
1386
1387 ebegin "Setting root password"
916 # Do this from memory, as we don't want clear text passwords in temp files 1388 # Do this from memory, as we don't want clear text passwords in temp files
917 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1389 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
918 "${ROOT}/usr/bin/mysql" \ 1390 "${ROOT}/usr/bin/mysql" \
919 --socket=${socket} \ 1391 --socket=${socket} \
920 -hlocalhost \ 1392 -hlocalhost \
921 -e "${sql}" 1393 -e "${sql}"
1394 eend $?
922 1395
923 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1396 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
924
925 "${ROOT}/usr/bin/mysql" \ 1397 "${ROOT}/usr/bin/mysql" \
926 --socket=${socket} \ 1398 --socket=${socket} \
927 -hlocalhost \ 1399 -hlocalhost \
928 -uroot \ 1400 -uroot \
929 -p"${pwd1}" \ 1401 -p"${MYSQL_ROOT_PASSWORD}" \
930 mysql < "${sqltmp}" 1402 mysql < "${sqltmp}"
1403 rc=$?
1404 eend $?
1405 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
931 1406
932 # Stop the server and cleanup 1407 # Stop the server and cleanup
1408 einfo "Stopping the server ..."
933 kill $(< "${pidfile}" ) 1409 kill $(< "${pidfile}" )
934 rm -f "${sqltmp}" 1410 rm -f "${sqltmp}"
935 einfo "Stopping the server ..."
936 wait %1 1411 wait %1
937 einfo "Done" 1412 einfo "Done"
938} 1413}
939 1414
1415# @FUNCTION: mysql_pkg_postrm
1416# @DESCRIPTION:
1417# Remove mysql symlinks.
940mysql_pkg_postrm() { 1418mysql_pkg_postrm() {
941 if [[ ${PN} == "mysql-slotted" ]] ; then
942 mysql_lib_symlinks 1419 : # mysql_lib_symlinks "${D}"
943 mysql_clients_link_to_best_version
944 fi
945} 1420}

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.156

  ViewVC Help
Powered by ViewVC 1.1.20