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

Diff of /eclass/mysql.eclass

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

Revision 1.72 Revision 1.112
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 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.72 2007/03/16 22:47:29 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.112 2009/07/06 18:58:41 robbat2 Exp $
4 4
5# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
6# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
7 8# - Robin H. Johnson <robbat2@gentoo.org>
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
9# Note that MYSQL_VERSION_ID must be empty!
10 9
11WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
12WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
13 12
14inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
15 14
16# Shorten the path because the socket path length must be shorter than 107 chars 15# Shorten the path because the socket path length must be shorter than 107 chars
17# and we will run a mysql server during test phase 16# and we will run a mysql server during test phase
18S="${WORKDIR}/mysql" 17S="${WORKDIR}/mysql"
19 18
20[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
21 20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
22if [[ ${PR#r} -lt 60 ]] ; then 21 EGIT_PROJECT=mysql-extras
23 IS_BITKEEPER=0 22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
24elif [[ ${PR#r} -lt 90 ]] ; then 23 inherit git
25 IS_BITKEEPER=60
26else
27 IS_BITKEEPER=90
28fi 24fi
29 25
30# MYSQL_VERSION_ID will be: 26# MYSQL_VERSION_ID will be:
31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 27# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
32# This is an important part, because many of the choices the MySQL ebuild will do 28# This is an important part, because many of the choices the MySQL ebuild will do
33# depend on this variable. 29# depend on this variable.
34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 30# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
31# We also strip off upstream's trailing letter that they use to respin tarballs
35 32
36MYSQL_VERSION_ID="" 33MYSQL_VERSION_ID=""
34tpv="${PV%[a-z]}"
37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 35tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
38for vatom in 0 1 2 3 ; do 36for vatom in 0 1 2 3 ; do
39 # pad to length 2 37 # pad to length 2
40 tpv[${vatom}]="00${tpv[${vatom}]}" 38 tpv[${vatom}]="00${tpv[${vatom}]}"
41 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 39 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
42done 40done
43# strip leading "0" (otherwise it's considered an octal number by BASH) 41# strip leading "0" (otherwise it's considered an octal number by BASH)
44MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 42MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
45 43
44# Community features are available in mysql-community
45# AND in the re-merged mysql-5.0.82 and newer
46if [ "${PN}" == "mysql-community" ]; then
47 MYSQL_COMMUNITY_FEATURES=1
48elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
49 MYSQL_COMMUNITY_FEATURES=1
50else
51 MYSQL_COMMUNITY_FEATURES=0
52fi
53
46# Be warned, *DEPEND are version-dependant 54# Be warned, *DEPEND are version-dependant
55# These are used for both runtime and compiletime
47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 56DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
48 userland_GNU? ( sys-process/procps ) 57 userland_GNU? ( sys-process/procps )
49 >=sys-apps/sed-4 58 >=sys-apps/sed-4
50 >=sys-apps/texinfo-4.7-r1 59 >=sys-apps/texinfo-4.7-r1
51 >=sys-libs/readline-4.1 60 >=sys-libs/readline-4.1
55for i in "" "-community" ; do 64for i in "" "-community" ; do
56 [[ "${i}" == ${PN#mysql} ]] || 65 [[ "${i}" == ${PN#mysql} ]] ||
57 DEPEND="${DEPEND} !dev-db/mysql${i}" 66 DEPEND="${DEPEND} !dev-db/mysql${i}"
58done 67done
59 68
69RDEPEND="${DEPEND}
70 !minimal? ( dev-db/mysql-init-scripts )
71 selinux? ( sec-policy/selinux-mysql )"
72
73# compile-time-only
60mysql_version_is_at_least "5.1" \ 74mysql_version_is_at_least "5.1" \
61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 75|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
62 76
77# compile-time-only
63mysql_version_is_at_least "5.1.12" \ 78mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 79&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
65 80
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 81# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 82PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 83
69# BitKeeper dependency, compile-time only 84# For other stuff to bring us in
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 85PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
86
87# Work out the default SERVER_URI correctly
88if [ -z "${SERVER_URI}" ]; then
89 # The community build is on the mirrors
90 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
91 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
92 # The (old) enterprise source is on the primary site only
93 elif [ "${PN}" == "mysql" ]; then
94 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
95 fi
96fi
71 97
72# Define correct SRC_URIs 98# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 99SRC_URI="${SERVER_URI}"
100
101[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
102 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
74 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 103 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
75mysql_version_is_at_least "5.1.12" \ 104mysql_version_is_at_least "5.1.12" \
76&& [[ -n "${PBXT_VERSION}" ]] \ 105&& [[ -n "${PBXT_VERSION}" ]] \
77&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 106&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
78 107
79DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 108DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
80HOMEPAGE="http://www.mysql.com/" 109HOMEPAGE="http://www.mysql.com/"
81LICENSE="GPL-2" 110LICENSE="GPL-2"
82SLOT="0" 111SLOT="0"
83IUSE="big-tables debug embedded minimal perl selinux ssl static" 112IUSE="big-tables debug embedded minimal perl selinux ssl static"
84RESTRICT="confcache"
85 113
86mysql_version_is_at_least "4.1" \ 114mysql_version_is_at_least "4.1" \
87&& IUSE="${IUSE} latin1" 115&& IUSE="${IUSE} latin1"
88 116
89mysql_version_is_at_least "4.1.3" \ 117mysql_version_is_at_least "4.1.3" \
94 122
95mysql_version_is_at_least "5.0.18" \ 123mysql_version_is_at_least "5.0.18" \
96&& IUSE="${IUSE} max-idx-128" 124&& IUSE="${IUSE} max-idx-128"
97 125
98mysql_version_is_at_least "5.1" \ 126mysql_version_is_at_least "5.1" \
99&& IUSE="${IUSE} innodb"
100
101mysql_version_is_at_least "5.1" \
102|| IUSE="${IUSE} berkdb" 127|| IUSE="${IUSE} berkdb"
103 128
104mysql_version_is_at_least "5.1.12" \ 129mysql_version_is_at_least "5.1.12" \
105&& IUSE="${IUSE} pbxt" 130&& IUSE="${IUSE} pbxt"
106 131
107RDEPEND="${DEPEND} 132[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
108 !minimal? ( dev-db/mysql-init-scripts ) 133&& IUSE="${IUSE} community profiling"
109 selinux? ( sec-policy/selinux-mysql )"
110 134
111EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 135case "${EAPI:-0}" in
136 2)
137 EXPORT_FUNCTIONS pkg_setup \
138 src_unpack src_prepare \
139 src_configure src_compile \
140 src_install \
141 pkg_preinst pkg_postinst \
112 pkg_postinst pkg_config pkg_postrm 142 pkg_config pkg_postrm
143 ;;
144 *)
145 EXPORT_FUNCTIONS pkg_setup \
146 src_unpack \
147 src_compile \
148 src_install \
149 pkg_preinst pkg_postinst \
150 pkg_config pkg_postrm
151 ;;
152esac
113 153
114# 154#
115# HELPER FUNCTIONS: 155# HELPER FUNCTIONS:
116# 156#
117
118bitkeeper_fetch() {
119 local reposuf
120 if [[ -z "${1}" ]] ; then
121 local tpv
122 tpv=( ${PV//[-._]/ } )
123 reposuf="mysql-${tpv[0]}.${tpv[1]}"
124 else
125 reposuf="${1}"
126 fi
127 einfo "Using '${reposuf}' repository."
128 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
129 ## -- ebk_store_dir: bitkeeper sources store directory
130 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
131 ## -- ebk_fetch_cmd: bitkeeper fetch command
132 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
133 # hint: does not work
134 local ebk_fetch_cmd="sfioball"
135 ## -- ebk_update_cmd: bitkeeper update command
136 local ebk_update_cmd="update"
137
138 # addread "/etc/bitkeeper"
139 addwrite "${ebk_store_dir}"
140
141 if [[ ! -d "${ebk_store_dir}" ]] ; then
142 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
143 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
144 fi
145
146 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
147
148 local wc_path=${reposuf}
149
150 if [[ ! -d "${wc_path}" ]] ; then
151 local options="-r+"
152
153 # first checkout
154 einfo "bitkeeper checkout start -->"
155 einfo " repository: ${repo_uri}"
156
157 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
158 || die "BK: couldn't fetch from ${repo_uri}"
159 else
160 if [[ ! -d "${wc_path}/BK" ]] ; then
161 popd
162 die "Looks like ${wc_path} is not a bitkeeper path"
163 fi
164
165 # update working copy
166 einfo "bitkeeper update start -->"
167 einfo " repository: ${repo_uri}"
168
169 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
170 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
171 fi
172
173 einfo " working copy: ${wc_path}"
174 cd "${wc_path}"
175 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
176
177 echo
178 popd
179}
180 157
181mysql_disable_test() { 158mysql_disable_test() {
182 local testname="${1}" ; shift 159 local testname="${1}" ; shift
183 local reason="${@}" 160 local reason="${@}"
184 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 161 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
197 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 174 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
198 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 175 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
199 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 176 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
200 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 177 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
201 178
202 if [[ -z "${DATADIR}" ]] ; then 179 if [[ -z "${MY_DATADIR}" ]] ; then
203 DATADIR="" 180 MY_DATADIR=""
204 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 181 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
205 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 182 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
206 | sed -ne '/datadir/s|^--datadir=||p' \ 183 | sed -ne '/datadir/s|^--datadir=||p' \
207 | tail -n1` 184 | tail -n1`
208 if [[ -z "${DATADIR}" ]] ; then 185 if [[ -z "${MY_DATADIR}" ]] ; then
209 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 186 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
210 | sed -e 's/.*=\s*//'` 187 | sed -e 's/.*=\s*//' \
188 | tail -n1`
211 fi 189 fi
212 fi 190 fi
213 if [[ -z "${DATADIR}" ]] ; then 191 if [[ -z "${MY_DATADIR}" ]] ; then
214 DATADIR="${MY_LOCALSTATEDIR}" 192 MY_DATADIR="${MY_LOCALSTATEDIR}"
215 einfo "Using default DATADIR" 193 einfo "Using default MY_DATADIR"
216 fi 194 fi
217 elog "MySQL DATADIR is ${DATADIR}" 195 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
218 196
219 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 197 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
220 if [[ -e "${DATADIR}" ]] ; then 198 if [[ -e "${MY_DATADIR}" ]] ; then
221 elog "Previous datadir found, it's YOUR job to change" 199 # If you get this and you're wondering about it, see bug #207636
222 elog "ownership and take care of it" 200 elog "MySQL datadir found in ${MY_DATADIR}"
201 elog "A new one will not be created."
223 PREVIOUS_DATADIR="yes" 202 PREVIOUS_DATADIR="yes"
224 else 203 else
225 PREVIOUS_DATADIR="no" 204 PREVIOUS_DATADIR="no"
226 fi 205 fi
227 export PREVIOUS_DATADIR 206 export PREVIOUS_DATADIR
228 fi 207 fi
208 else
209 if [[ ${EBUILD_PHASE} == "config" ]]; then
210 local new_MY_DATADIR
211 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
212 | sed -ne '/datadir/s|^--datadir=||p' \
213 | tail -n1`
214
215 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
216 ewarn "MySQL MY_DATADIR has changed"
217 ewarn "from ${MY_DATADIR}"
218 ewarn "to ${new_MY_DATADIR}"
219 MY_DATADIR="${new_MY_DATADIR}"
220 fi
221 fi
229 fi 222 fi
230 223
231 MY_SOURCEDIR=${SERVER_URI##*/} 224 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 225 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 226
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 227 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 228 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 229 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 230}
238 231
239configure_minimal() { 232configure_minimal() {
240 # These are things we exclude from a minimal build, please 233 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 234 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 235 # but we then delete it before packaging.
243 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 236 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
244 237
245 for i in ${minimal_exclude_list} ; do 238 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 239 myconf="${myconf} --without-${i}"
247 done 240 done
248 myconf="${myconf} --with-extra-charsets=none" 241 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 242 myconf="${myconf} --enable-local-infile"
250 243
251 if use static ; then 244 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 245 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 246 myconf="${myconf} --disable-shared --with-pic"
254 else 247 else
255 myconf="${myconf} --enable-shared --enable-static" 248 myconf="${myconf} --enable-shared --enable-static"
256 fi 249 fi
257 250
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 251 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
274 myconf="${myconf} --without-libwrap" 267 myconf="${myconf} --without-libwrap"
275 268
276 if use static ; then 269 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 270 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 271 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 272 myconf="${myconf} --disable-shared --with-pic"
280 else 273 else
281 myconf="${myconf} --enable-shared --enable-static" 274 myconf="${myconf} --enable-shared --enable-static"
282 fi 275 fi
283 276
284 if use debug ; then 277 if use debug ; then
288 mysql_version_is_at_least "4.1.3" \ 281 mysql_version_is_at_least "4.1.3" \
289 && use cluster \ 282 && use cluster \
290 && myconf="${myconf} --without-ndb-debug" 283 && myconf="${myconf} --without-ndb-debug"
291 fi 284 fi
292 285
286 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
287 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
288 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
289 ewarn "You MUST file bugs without these variables set."
290 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
291 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
293 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 292 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
294 myconf="${myconf} --with-charset=utf8" 293 myconf="${myconf} --with-charset=utf8"
295 myconf="${myconf} --with-collation=utf8_general_ci" 294 myconf="${myconf} --with-collation=utf8_general_ci"
296 else 295 else
297 myconf="${myconf} --with-charset=latin1" 296 myconf="${myconf} --with-charset=latin1"
298 myconf="${myconf} --with-collation=latin1_swedish_ci" 297 myconf="${myconf} --with-collation=latin1_swedish_ci"
299 fi 298 fi
300 299
301 if use embedded ; then 300 if use embedded ; then
302 myconf="${myconf} --with-embedded-privilege-control" 301 myconf="${myconf} --with-embedded-privilege-control"
303 myconf="${myconf} --with-embedded-server" 302 myconf="${myconf} --with-embedded-server"
326 myconf="${myconf} $(use_with ssl)" 325 myconf="${myconf} $(use_with ssl)"
327 else 326 else
328 myconf="${myconf} $(use_with ssl openssl)" 327 myconf="${myconf} $(use_with ssl openssl)"
329 fi 328 fi
330 329
330 if mysql_version_is_at_least "5.0.60" ; then
331 if use berkdb ; then
332 elog "Berkeley DB support was disabled due to build failures"
333 elog "on multiple arches, go to a version earlier than 5.0.60"
334 elog "if you want it again. Gentoo bug #224067."
335 fi
336 myconf="${myconf} --without-berkeley-db"
337 elif use berkdb ; then
331 # The following fix is due to a bug with bdb on SPARC's. See: 338 # The following fix is due to a bug with bdb on SPARC's. See:
332 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 339 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
333 # It comes down to non-64-bit safety problems. 340 # It comes down to non-64-bit safety problems.
334 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 341 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
335 elog "Berkeley DB support was disabled due to incompatible arch" 342 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
343 myconf="${myconf} --without-berkeley-db"
344 else
345 myconf="${myconf} --with-berkeley-db=./bdb"
346 fi
347 else
336 myconf="${myconf} --without-berkeley-db" 348 myconf="${myconf} --without-berkeley-db"
337 else
338 if use berkdb ; then
339 myconf="${myconf} --with-berkeley-db=./bdb"
340 else
341 myconf="${myconf} --without-berkeley-db"
342 fi
343 fi 349 fi
344 350
345 if mysql_version_is_at_least "4.1.3" ; then 351 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 352 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 353 myconf="${myconf} $(use_with cluster ndbcluster)"
362 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 368 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
363 if mysql_version_is_at_least "5.0.3" ; then 369 if mysql_version_is_at_least "5.0.3" ; then
364 elog "Before using the Federated storage engine, please be sure to read" 370 elog "Before using the Federated storage engine, please be sure to read"
365 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 371 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
366 myconf="${myconf} --with-federated-storage-engine" 372 myconf="${myconf} --with-federated-storage-engine"
373 fi
374 fi
375
376 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
377 myconf="${myconf} `use_enable community community-features`"
378 if use community; then
379 myconf="${myconf} `use_enable profiling`"
380 else
381 myconf="${myconf} --disable-profiling"
367 fi 382 fi
368 fi 383 fi
369 384
370 mysql_version_is_at_least "5.0.18" \ 385 mysql_version_is_at_least "5.0.18" \
371 && use max-idx-128 \ 386 && use max-idx-128 \
394 409
395 elog "Before using the Federated storage engine, please be sure to read" 410 elog "Before using the Federated storage engine, please be sure to read"
396 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 411 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
397 fi 412 fi
398 413
399 if use innodb ; then 414 # Upstream specifically requests that InnoDB always be built.
400 plugins="${plugins},innobase" 415 plugins="${plugins},innobase"
401 fi
402 416
403 # like configuration=max-no-ndb 417 # like configuration=max-no-ndb
404 if use cluster ; then 418 if use cluster ; then
405 plugins="${plugins},ndbcluster" 419 plugins="${plugins},ndbcluster"
406 myconf="${myconf} --with-ndb-binlog" 420 myconf="${myconf} --with-ndb-binlog"
411 fi 425 fi
412 426
413 myconf="${myconf} --with-plugins=${plugins}" 427 myconf="${myconf} --with-plugins=${plugins}"
414} 428}
415 429
416pbxt_src_compile() { 430pbxt_src_configure() {
417 mysql_init_vars 431 mysql_init_vars
418 432
419 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 433 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
420 434
421 einfo "Reconfiguring dir '${PWD}'" 435 einfo "Reconfiguring dir '${PWD}'"
424 local myconf="" 438 local myconf=""
425 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 439 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
426 use debug && myconf="${myconf} --with-debug=full" 440 use debug && myconf="${myconf} --with-debug=full"
427 # TODO: is it safe/needed to use econf here ? 441 # TODO: is it safe/needed to use econf here ?
428 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 442 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
443}
444
445pbxt_src_compile() {
446 # Be backwards compatible for now
447 if [[ $EAPI != 2 ]]; then
448 pbxt_src_configure
449 fi
429 # TODO: is it safe/needed to use emake here ? 450 # TODO: is it safe/needed to use emake here ?
430 make || die "Problem making PBXT storage engine (${myconf})" 451 make || die "Problem making PBXT storage engine (${myconf})"
431 452
432 popd 453 popd
433 # TODO: modify test suite for PBXT 454 # TODO: modify test suite for PBXT
440} 461}
441 462
442# 463#
443# EBUILD FUNCTIONS 464# EBUILD FUNCTIONS
444# 465#
445
446mysql_pkg_setup() { 466mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 467 if hasq test ${FEATURES} ; then
448 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 468 if ! use minimal ; then
469 if [[ $UID -eq 0 ]]; then
470 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
471 fi
472 fi
473 fi
449 474
450 # Check for USE flag problems in pkg_setup 475 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 476 if use static && use ssl ; then
452 eerror "MySQL does not support being built statically with SSL support enabled!" 477 eerror "MySQL does not support being built statically with SSL support enabled!"
453 die "MySQL does not support being built statically with SSL support enabled!" 478 die "MySQL does not support being built statically with SSL support enabled!"
466 && use minimal ; then 491 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 492 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 493 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 fi 494 fi
470 495
496 # This should come after all of the die statements
497 enewgroup mysql 60 || die "problem adding 'mysql' group"
498 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
499
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 500 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 501 && use berkdb \
473 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 502 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
474} 503}
475 504
476mysql_src_unpack() { 505mysql_src_unpack() {
477 # Initialize the proper variables first 506 # Initialize the proper variables first
478 mysql_init_vars 507 mysql_init_vars
479 508
480 unpack ${A} 509 unpack ${A}
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 510 # Grab the patches
482 if mysql_check_version_range "5.1 to 5.1.99" ; then 511 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
483 bitkeeper_fetch "mysql-5.1-ndb" 512
484 elif mysql_check_version_range "5.2 to 5.2.99" ; then
485 bitkeeper_fetch "mysql-5.2-falcon"
486 else
487 bitkeeper_fetch
488 fi
489 cd "${S}"
490 einfo "Running upstream autorun over BK sources ..."
491 BUILD/autorun.sh
492 else
493 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 513 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
514
515 # Be backwards compatible for now
516 if [[ $EAPI != 2 ]]; then
517 mysql_src_prepare
518 fi
519}
520
521mysql_src_prepare() {
494 cd "${S}" 522 cd "${S}"
495 fi
496 523
497 # Apply the patches for this MySQL version 524 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 525 EPATCH_SUFFIX="patch"
499 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 526 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
527 # Clean out old items
528 rm -f "${EPATCH_SOURCE}"/*
529 # Now link in right patches
500 mysql_mv_patches 530 mysql_mv_patches
531 # And apply
501 epatch 532 epatch
502 533
503 # Additional checks, remove bundled zlib 534 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 535 rm -f "${S}/zlib/"*.[ch]
505 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 536 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
521 552
522 local rebuilddirlist d 553 local rebuilddirlist d
523 554
524 if mysql_version_is_at_least "5.1.12" ; then 555 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 556 rebuilddirlist="."
526 # TODO: check this with a cmake expert 557 # TODO: check this with a cmake expert
527 use innodb \
528 && cmake \ 558 cmake \
529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 559 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 560 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 561 "storage/innobase"
532 else 562 else
533 rebuilddirlist=". innobase" 563 rebuilddirlist=". innobase"
534 fi 564 fi
535 565
543 if mysql_check_version_range "4.1 to 5.0.99.99" \ 573 if mysql_check_version_range "4.1 to 5.0.99.99" \
544 && use berkdb ; then 574 && use berkdb ; then
545 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 575 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
546 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 576 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
547 || die "Could not copy libtool.m4 to bdb/dist/" 577 || die "Could not copy libtool.m4 to bdb/dist/"
578 #These files exist only with libtool-2*, and need to be included.
579 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
580 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
581 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
582 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
583 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
584 fi
548 pushd "bdb/dist" &>/dev/null 585 pushd "bdb/dist" &>/dev/null
549 sh s_all \ 586 sh s_all \
550 || die "Failed bdb reconfigure" 587 || die "Failed bdb reconfigure"
551 popd &>/dev/null 588 popd &>/dev/null
552 fi 589 fi
553} 590}
554 591
555mysql_src_compile() { 592mysql_src_configure() {
556 # Make sure the vars are correctly initialized 593 # Make sure the vars are correctly initialized
557 mysql_init_vars 594 mysql_init_vars
558 595
559 # $myconf is modified by the configure_* functions 596 # $myconf is modified by the configure_* functions
560 local myconf="" 597 local myconf=""
573 # Bug #114895, bug #110149 610 # Bug #114895, bug #110149
574 filter-flags "-O" "-O[01]" 611 filter-flags "-O" "-O[01]"
575 612
576 # glib-2.3.2_pre fix, bug #16496 613 # glib-2.3.2_pre fix, bug #16496
577 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 614 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
615
616 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
617 # fail badly during cluster startup.
618 if [[ $(gcc-major-version) -lt 4 ]]; then
619 filter-flags "-fstack-protector-all"
620 fi
578 621
579 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 622 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
580 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 623 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
581 mysql_version_is_at_least "5.0" \ 624 mysql_version_is_at_least "5.0" \
582 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 625 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
599 # TODO: Move this before autoreconf !!! 642 # TODO: Move this before autoreconf !!!
600 find . -type f -name Makefile -print0 \ 643 find . -type f -name Makefile -print0 \
601 | xargs -0 -n100 sed -i \ 644 | xargs -0 -n100 sed -i \
602 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 645 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
603 646
647 if [[ $EAPI == 2 ]]; then
648 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
649 fi
650}
651
652mysql_src_compile() {
653 # Be backwards compatible for now
654 if [[ $EAPI != 2 ]]; then
655 mysql_src_configure
656 fi
657
604 emake || die "emake failed" 658 emake || die "emake failed"
605 659
606 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 660 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
607} 661}
608 662
612 666
613 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 667 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
614 668
615 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 669 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
616 670
617 insinto "${MY_INCLUDEDIR}"
618 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
619
620 # Convenience links 671 # Convenience links
672 einfo "Making Convenience links for mysqlcheck multi-call binary"
621 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 673 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 674 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 675 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
624 676
625 # Various junk (my-*.cnf moved elsewhere) 677 # Various junk (my-*.cnf moved elsewhere)
678 einfo "Removing duplicate /usr/share/mysql files"
626 rm -Rf "${D}/usr/share/info" 679 rm -Rf "${D}/usr/share/info"
627 for removeme in "mysql-log-rotate" mysql.server* \ 680 for removeme in "mysql-log-rotate" mysql.server* \
628 binary-configure* my-*.cnf mi_test_all* 681 binary-configure* my-*.cnf mi_test_all*
629 do 682 do
630 rm -f "${D}"/usr/share/mysql/${removeme} 683 rm -f "${D}"/usr/share/mysql/${removeme}
631 done 684 done
632 685
633 # Clean up stuff for a minimal build 686 # Clean up stuff for a minimal build
634 if use minimal ; then 687 if use minimal ; then
688 einfo "Remove all extra content for minimal build"
635 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 689 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
636 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} 690 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}
637 rm -f "${D}/usr/sbin/mysqld" 691 rm -f "${D}/usr/sbin/mysqld"
638 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 692 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
639 fi 693 fi
642 if mysql_version_is_at_least "4.1" ; then 696 if mysql_version_is_at_least "4.1" ; then
643 mysql_mycnf_version="4.1" 697 mysql_mycnf_version="4.1"
644 else 698 else
645 mysql_mycnf_version="4.0" 699 mysql_mycnf_version="4.0"
646 fi 700 fi
701 einfo "Building default my.cnf"
647 insinto "${MY_SYSCONFDIR}" 702 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 703 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 704 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 705 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 706 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 707 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 708 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 709 fi
655 newins "${TMPDIR}/my.cnf.ok" my.cnf 710 newins "${TMPDIR}/my.cnf.ok" my.cnf
656 711
657 # Minimal builds don't have the MySQL server 712 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 713 if ! use minimal ; then
714 einfo "Creating initial directories"
659 # Empty directories ... 715 # Empty directories ...
660 diropts "-m0750" 716 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 717 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 718 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 719 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 720 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 721 fi
666 722
667 diropts "-m0755" 723 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 724 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 725 dodir "${folder}"
671 chown -R mysql:mysql "${D}/${folder}" 727 chown -R mysql:mysql "${D}/${folder}"
672 done 728 done
673 fi 729 fi
674 730
675 # Docs 731 # Docs
732 einfo "Installing docs"
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 733 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
734 doinfo "${S}"/Docs/mysql.info
677 735
678 # Minimal builds don't have the MySQL server 736 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 737 if ! use minimal ; then
738 einfo "Including support files and sample configurations"
680 docinto "support-files" 739 docinto "support-files"
681 for script in \ 740 for script in \
682 support-files/my-*.cnf \ 741 "${S}"/support-files/my-*.cnf \
683 support-files/magic \ 742 "${S}"/support-files/magic \
684 support-files/ndb-config-2-node.ini 743 "${S}"/support-files/ndb-config-2-node.ini
685 do 744 do
686 dodoc "${script}" 745 dodoc "${script}"
687 done 746 done
688 747
689 docinto "scripts" 748 docinto "scripts"
690 for script in scripts/mysql* ; do 749 for script in "${S}"/scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 750 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 751 done
752
693 fi 753 fi
694 754
695 mysql_lib_symlinks "${D}" 755 mysql_lib_symlinks "${D}"
696} 756}
697 757
754 && use berkdb \ 814 && use berkdb \
755 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 815 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
756} 816}
757 817
758mysql_pkg_config() { 818mysql_pkg_config() {
819 local old_MY_DATADIR="${MY_DATADIR}"
820
759 # Make sure the vars are correctly initialized 821 # Make sure the vars are correctly initialized
760 mysql_init_vars 822 mysql_init_vars
761 823
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 824 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 825
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 826 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 die "Minimal builds do NOT include the MySQL server" 827 die "Minimal builds do NOT include the MySQL server"
828 fi
829
830 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
831 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
832 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
833
834 if [[ -d "${old_MY_DATADIR_s}" ]]; then
835 if [[ -d "${MY_DATADIR_s}" ]]; then
836 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
837 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
838 else
839 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
840 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
841 || die "Moving MY_DATADIR failed"
842 fi
843 else
844 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
845 if [[ -d "${MY_DATADIR_s}" ]]; then
846 ewarn "Attempting to use ${MY_DATADIR_s}"
847 else
848 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
849 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
850 fi
851 fi
766 fi 852 fi
767 853
768 local pwd1="a" 854 local pwd1="a"
769 local pwd2="b" 855 local pwd2="b"
770 local maxtry=5 856 local maxtry=5
771 857
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 858 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 859 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 860 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 ewarn "Please rename or delete it if you wish to replace it." 861 ewarn "Please rename or delete it if you wish to replace it."
776 die "MySQL database already exists!" 862 die "MySQL database already exists!"
777 fi 863 fi
864
865 # Bug #213475 - MySQL _will_ object strenously if your machine is named
866 # localhost. Also causes weird failures.
867 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
778 868
779 einfo "Creating the mysql database and setting proper" 869 einfo "Creating the mysql database and setting proper"
780 einfo "permissions on it ..." 870 einfo "permissions on it ..."
781 871
782 einfo "Insert a password for the mysql 'root' user" 872 einfo "Insert a password for the mysql 'root' user"
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 888 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 889 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 890 help_tables="${TMPDIR}/fill_help_tables.sql"
801 891
802 pushd "${TMPDIR}" &>/dev/null 892 pushd "${TMPDIR}" &>/dev/null
803 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 893 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
894 if [ $? -ne 0 ]; then
895 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
896 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
897 fi
804 popd &>/dev/null 898 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 899 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 900 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 901 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 902 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 903
810 if mysql_version_is_at_least "4.1.3" ; then 904 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 905 options="--skip-ndbcluster"
812 906
813 # Filling timezones, see 907 # Filling timezones, see
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 918 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 919 ${options} \
826 --user=mysql \ 920 --user=mysql \
827 --skip-grant-tables \ 921 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 922 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 923 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 924 --skip-innodb \
831 --skip-bdb \ 925 --skip-bdb \
832 --skip-networking \ 926 --skip-networking \
833 --max_allowed_packet=8M \ 927 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 928 --net_buffer_length=16K \

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.112

  ViewVC Help
Powered by ViewVC 1.1.20