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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.115

  ViewVC Help
Powered by ViewVC 1.1.20